zorba-coders team mailing list archive

[Rodolfo Ochoa <rodolfo.ochoa@xxxxxxxxx>]

Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1099622 into lp:zorba.

Commit message:
Fix for PHP finding on Windows

Requested reviews:
  Juan Zacarias (juan457)
  Chris Hillery (ceejatec)
Related bugs:
  Bug #1099622 in Zorba: "PHP Detection"
  https://bugs.launchpad.net/zorba/+bug/1099622

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1099622/+merge/143213

Fix for PHP finding on Windows
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1099622/+merge/143213
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'cmake_modules/FindPHP5.cmake'
--- cmake_modules/FindPHP5.cmake	2012-10-18 00:03:08 +0000
+++ cmake_modules/FindPHP5.cmake	2013-01-15 00:03:22 +0000
@@ -157,16 +157,18 @@
 ENDIF(PHP5_VERSION LESS 5)
 
 ELSE (NOT WIN32 OR CYGWIN)
-MESSAGE(STATUS "Windows Environment Configuration...")
-#On Windows, set PHP5_INCLUDE_DIR with -D
-MESSAGE(STATUS "Path to source: " ${PHP5_INCLUDE_DIR})
-SET(PHP5_INCLUDES ${PHP5_INCLUDE_DIR})
-#SET(PHP5_EXTENSION_DIR "" CACHE PATH "Path to the ext subdir in binary PHP5")
-ENDIF (NOT WIN32 OR CYGWIN)
- 
+
+################  WINDOWS CONFIG
+
 IF(NOT PHP5_INCLUDE_DIR )
   SET (PHP5_INCLUDE_DIR ${CMAKE_PREFIX_PATH})
 ENDIF(NOT PHP5_INCLUDE_DIR )
+
+MESSAGE(STATUS "Windows Environment Configuration.")
+MESSAGE(STATUS "PHP Path: " ${PHP5_INCLUDE_DIR})
+SET(PHP5_INCLUDES ${PHP5_INCLUDE_DIR})
+
+ENDIF (NOT WIN32 OR CYGWIN)
  
 set(PHP5_MAIN_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/main)
 set(PHP5_TSRM_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/TSRM)
@@ -176,8 +178,6 @@
 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})
-
 IF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
     SET(PHP5_FOUND "yes")
     MESSAGE(STATUS "Found PHP5-Version ${PHP5_VERSION}")