[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-05-20 15:25:11
Message-ID: 1211297111.219613.25808.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 810382 by moenicke:

* module doesnt make trouble if no php-config was found



 M  +24 -23    FindPHP5.cmake  


--- trunk/KDE/kdebindings/cmake/modules/FindPHP5.cmake #810381:810382
@@ -129,35 +129,36 @@
   NAMES php5-config php-config
   )
 
-EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --version
-   OUTPUT_VARIABLE PHP5_VERSION)
+IF(PHP5_CONFIG_EXECUTABLE)
+  EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --version
+    OUTPUT_VARIABLE PHP5_VERSION)
 
-EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --extension-dir
-   OUTPUT_VARIABLE PHP5_EXTENSION_DIR)
-STRING(REPLACE "\n" "" PHP5_EXTENSION_DIR "${PHP5_EXTENSION_DIR}")
+  EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --extension-dir
+    OUTPUT_VARIABLE PHP5_EXTENSION_DIR)
+  STRING(REPLACE "\n" "" PHP5_EXTENSION_DIR "${PHP5_EXTENSION_DIR}")
 
-EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --includes
-   OUTPUT_VARIABLE PHP5_INCLUDES)
-STRING(REPLACE "-I" ";" PHP5_INCLUDES "${PHP5_INCLUDES}")
-STRING(REPLACE " " "" PHP5_INCLUDES "${PHP5_INCLUDES}")
-LIST(GET PHP5_INCLUDES 0 PHP5_INCLUDE_DIR)
+  EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --includes
+    OUTPUT_VARIABLE PHP5_INCLUDES)
+  STRING(REPLACE "-I" ";" PHP5_INCLUDES "${PHP5_INCLUDES}")
+  STRING(REPLACE " " "" PHP5_INCLUDES "${PHP5_INCLUDES}")
+  LIST(GET PHP5_INCLUDES 0 PHP5_INCLUDE_DIR)
 
-set(PHP5_MAIN_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/main)
-set(PHP5_TSRM_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/TSRM)
-set(PHP5_ZEND_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/Zend)
-set(PHP5_REGEX_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/regex)
-set(PHP5_EXT_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext)
-set(PHP5_DATE_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext/date/lib)
-set(PHP5_STANDARD_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext/standard)
+  set(PHP5_MAIN_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/main)
+  set(PHP5_TSRM_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/TSRM)
+  set(PHP5_ZEND_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/Zend)
+  set(PHP5_REGEX_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/regex)
+  set(PHP5_EXT_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext)
+  set(PHP5_DATE_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext/date/lib)
+  set(PHP5_STANDARD_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext/standard)
 
-MESSAGE(STATUS ${PHP5_MAIN_INCLUDE_DIR})
+  MESSAGE(STATUS ${PHP5_MAIN_INCLUDE_DIR})
 
-IF(PHP5_VERSION LESS 5)
+  IF(PHP5_VERSION LESS 5)
     MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
-ENDIF(PHP5_VERSION LESS 5)
+  ENDIF(PHP5_VERSION LESS 5)
 
-IF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
+  IF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
     set(PHP5_FOUND "yes")
     MESSAGE(STATUS "Found PHP5-Version ${PHP5_VERSION}")
-ENDIF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
-
+  ENDIF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
+ENDIF(PHP5_CONFIG_EXECUTABLE)
[prev in list] [next in list] [prev in thread] [next in thread]