[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/cmake/modules
From:       Laurent Montel <montel () kde ! org>
Date:       2007-06-13 20:25:29
Message-ID: 1181766329.467816.26415.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 675208 by mlaurent:

Fix modules


 M  +1 -1      FindTheora.cmake  
 M  +1 -1      FindTunePimp.cmake  
 M  +1 -1      FindXCB.cmake  
 M  +4 -4      FindXine.cmake  


--- trunk/KDE/kdemultimedia/cmake/modules/FindTheora.cmake #675207:675208
@@ -46,7 +46,7 @@
   endif (NOT Theora_FIND_QUIETLY)
 else (THEORA_FOUND)
   if (Theora_FIND_REQUIRED)
-     MESSAGE( STATUS "theora not found")
+     MESSAGE( FATAL_ERROR "theora not found")
   endif (Theora_FIND_REQUIRED)
 endif (THEORA_FOUND)
 
--- trunk/KDE/kdemultimedia/cmake/modules/FindTunePimp.cmake #675207:675208
@@ -8,7 +8,7 @@
 
 if(TUNEPIMP_INCLUDE_DIR AND TUNEPIMP_LIBRARY)
 	# Already in cache, be silent
-	set(TUNEPIMP_FIND_QUIETLY TRUE)	
+	set(TunePimp_FIND_QUIETLY TRUE)	
 endif(TUNEPIMP_INCLUDE_DIR AND TUNEPIMP_LIBRARY)
 
 set(TUNEPIMP_LIBRARY)
--- trunk/KDE/kdemultimedia/cmake/modules/FindXCB.cmake #675207:675208
@@ -22,7 +22,7 @@
   # in the FIND_PATH() and FIND_LIBRARY() calls
   INCLUDE(UsePkgConfig)
   PKGCONFIG(xcb _LibXCBIncDir _LibXCBLinkDir _LibXCBLinkFlags _LibXCBCflags)
-
+	  
   SET(LIBXCB_DEFINITIONS ${_LibXCBCflags})
 
   FIND_PATH(LIBXCB_INCLUDE_DIR xcb/xcb.h
--- trunk/KDE/kdemultimedia/cmake/modules/FindXine.cmake #675207:675208
@@ -16,10 +16,10 @@
   # Already in cache, be silent
   set(Xine_FIND_QUIETLY TRUE)
 endif (XINE_INCLUDE_DIR AND XINE_LIBRARIES)
-
-INCLUDE(UsePkgConfig)
-PKGCONFIG(libxine _LibXineIncDir _LibXineLinkDir _LibXineLinkFlags _LibXineCflags)
-
+  IF (NOT WIN32)
+	INCLUDE(UsePkgConfig)
+	PKGCONFIG(libxine _LibXineIncDir _LibXineLinkDir _LibXineLinkFlags _LibXineCflags)
+  ENDIF (NOT WIN32)
 FIND_PATH(XINE_INCLUDE_DIR NAMES xine.h 
     PATHS 
     ${_LibXineIncDir} 
[prev in list] [next in list] [prev in thread] [next in thread]