From 05b64921612794802f499f96e7e60a07f10deaa0 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Thu, 5 Apr 2007 11:51:18 +0000
Subject: Fix cmake file when we require it

svn path=/trunk/KDE/kdelibs/; revision=650763
---
 modules/FindGObject.cmake |  2 ++
 modules/FindXmms.cmake    | 20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/FindGObject.cmake b/modules/FindGObject.cmake
index 6501fcbc..62bed220 100644
--- a/modules/FindGObject.cmake
+++ b/modules/FindGObject.cmake
@@ -67,7 +67,9 @@ IF (GOBJECT_FOUND)
       MESSAGE(STATUS "Found GObject includes : ${GOBJECT_INCLUDE_DIR}")
    ENDIF (NOT GObject_FIND_QUIETLY)
 ELSE (GOBJECT_FOUND)
+    IF (GObject_FIND_REQUIRED)
       MESSAGE(STATUS "Could NOT find GObject")
+    ENDIF(OpenEXR_FIND_REQUIRED)
 ENDIF (GOBJECT_FOUND)
 
 MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR GOBJECT_LIBRARIES)
diff --git a/modules/FindXmms.cmake b/modules/FindXmms.cmake
index f5719b22..8718baf6 100644
--- a/modules/FindXmms.cmake
+++ b/modules/FindXmms.cmake
@@ -16,16 +16,28 @@ if(KDE4_XMMS)
 	#reset vars
 	set(XMMS_LIBRARIES)
 	set(XMMS_INCLUDE_DIR)
+
 	if(XMMSCONFIG_EXECUTABLE)
   		EXEC_PROGRAM(${XMMSCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XMMS_LIBRARIES)
 
   		EXEC_PROGRAM(${XMMSCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XMMS_INCLUDE_DIR)
-	set(XMMS_DEFINITIONS ${XMMS_INCLUDE_DIR})
-  	IF(XMMS_LIBRARIES AND XMMS_INCLUDE_DIR)
-    	SET(XMMS_FOUND TRUE)
-	ENDIF(XMMS_LIBRARIES AND XMMS_INCLUDE_DIR)
+		set(XMMS_DEFINITIONS ${XMMS_INCLUDE_DIR})
+  	
+		IF(XMMS_LIBRARIES AND XMMS_INCLUDE_DIR)
+    			SET(XMMS_FOUND TRUE)
+		ENDIF(XMMS_LIBRARIES AND XMMS_INCLUDE_DIR)
 
 	MARK_AS_ADVANCED(XMMS_INCLUDE_DIR XMMS_LIBRARIES)
 	endif(XMMSCONFIG_EXECUTABLE)
+
+  	if (XMMS_FOUND)
+    		if (NOT Xmms_FIND_QUIETLY)
+      			message(STATUS "Found Xmms: ${XMMS_LIBRARIES}")
+    		endif (NOT Xmms_FIND_QUIETLY)
+  	else (XMMS_FOUND)
+    		if (Xmms_FIND_REQUIRED)
+      			message(FATAL_ERROR "Could NOT find Xmms")
+    		endif (Xmms_FIND_REQUIRED)
+  	endif (XMMS_FOUND)
 endif(KDE4_XMMS)
 
-- 
cgit v1.2.1