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

List:       kde-commits
Subject:    KDE/kdebindings/cmake/modules
From:       Thomas Moenicke <tm () php-qt ! org>
Date:       2008-06-14 16:02:17
Message-ID: 1213459337.148271.24302.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 820519 by moenicke:

* check if user specified an environment variable PHP5_CONFIG_EXECUTABLE
* removing line breaks in version string



 M  +4 -2      FindPHP5.cmake  


--- trunk/KDE/kdebindings/cmake/modules/FindPHP5.cmake #820518:820519
@@ -123,14 +123,16 @@
   ENDFOREACH(symbol)
 ENDIF(APPLE)
 
-
+IF( NOT PHP5_CONFIG_EXECUTABLE )
 FIND_PROGRAM(PHP5_CONFIG_EXECUTABLE
   NAMES php5-config php-config
   )
+ENDIF( NOT PHP5_CONFIG_EXECUTABLE )
 
 IF(PHP5_CONFIG_EXECUTABLE)
   EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --version
     OUTPUT_VARIABLE PHP5_VERSION)
+  STRING(REPLACE "\n" "" PHP5_VERSION "${PHP5_VERSION}")
 
   EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --extension-dir
     OUTPUT_VARIABLE PHP5_EXTENSION_DIR)
@@ -158,6 +160,6 @@
 
   IF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
     set(PHP5_FOUND "yes")
-    MESSAGE(STATUS "Found PHP5-Version ${PHP5_VERSION}")
+    MESSAGE(STATUS "Found PHP5-Version ${PHP5_VERSION} (using ${PHP5_CONFIG_EXECUTABLE})")
   ENDIF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
 ENDIF(PHP5_CONFIG_EXECUTABLE)
[prev in list] [next in list] [prev in thread] [next in thread]