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

List:       kde-commits
Subject:    KDE/kdemultimedia/cmake/modules
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2006-10-16 0:02:05
Message-ID: 1160956925.292937.18241.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 595868 by wheeler:

Phonon-Xine requires at least Xine 1.1


 M  +8 -4      FindXine.cmake  


--- trunk/KDE/kdemultimedia/cmake/modules/FindXine.cmake #595867:595868
@@ -33,9 +33,13 @@
    /usr/local/bin
 )
 
-if (XINE_INCLUDE_DIR AND XINE_LIBRARY)
-   set(XINE_FOUND TRUE)
-endif (XINE_INCLUDE_DIR AND XINE_LIBRARY)
+if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
+   EXEC_PROGRAM(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE \
OUTPUT_VARIABLE XINE_VERSION) +   macro_ensure_version(1.1.0 ${XINE_VERSION} \
XINE_VERSION_OK) +   if (XINE_VERSION_OK)
+      set(XINE_FOUND TRUE)
+   endif (XINE_VERSION_OK)
+endif (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
 
 
 if (XINE_FOUND)
@@ -48,7 +52,7 @@
    endif(XINECONFIG_EXECUTABLE)
 else (XINE_FOUND)
    if (XINE_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find XINE")
+      message(FATAL_ERROR "Could NOT find XINE 1.1 or greater")
    endif (XINE_FIND_REQUIRED)
 endif (XINE_FOUND)
 


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