zorba-coders team mailing list archive

[Cezar Andrei <cezar.andrei@xxxxxxxxx>]

Cezar Andrei has proposed merging lp:~zorba-coders/zorba/mac-build-fix into lp:zorba.

Commit message:
Fixes for build on OSX Mountain Lion.

Requested reviews:
  Cezar Andrei (cezar-andrei)
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/mac-build-fix/+merge/193621

Fixes for build on OSX Mountain Lion.
-- 
https://code.launchpad.net/~zorba-coders/zorba/mac-build-fix/+merge/193621
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'swig/php/CMakeLists.txt'
--- swig/php/CMakeLists.txt	2013-09-24 21:47:07 +0000
+++ swig/php/CMakeLists.txt	2013-11-01 15:32:28 +0000
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-IF (PHP5_FOUND)
+IF (PHP5_FOUND AND PHP5_LIBRARY)
   MESSAGE (STATUS "SWIG: Generating PHP5 API")
 
   SET_SOURCE_FILES_PROPERTIES (zorba_api.i PROPERTIES CPLUSPLUS ON)
@@ -91,6 +91,6 @@
   ENDIF (NOT WIN32 OR CYGWIN)
   ADD_SUBDIRECTORY (tests)
 
-ELSE (PHP5_FOUND)
+ELSE (PHP5_FOUND AND PHP5_LIBRARY)
   MESSAGE (STATUS "SWIG: PHP5 binding not generated because library and include file are not installed.")
-ENDIF (PHP5_FOUND)
+ENDIF (PHP5_FOUND AND PHP5_LIBRARY)

=== modified file 'test/driver/CMakeLists.txt'
--- test/driver/CMakeLists.txt	2013-05-16 08:22:46 +0000
+++ test/driver/CMakeLists.txt	2013-11-01 15:32:28 +0000
@@ -33,35 +33,37 @@
 # Compile and build the multi-threaded testdriver executable, if boost
 # available
 #
-
-FIND_PACKAGE(Boost COMPONENTS filesystem)
-IF (NOT Boost_FILESYSTEM_FOUND)
-  MESSAGE(STATUS "Boost filesystem or system component not found - not building multithreaded test driver")
-ELSE (NOT Boost_FILESYSTEM_FOUND)
-  MESSAGE(STATUS "Found Boost v${Boost_LIB_VERSION}: ${Boost_INCLUDE_DIRS}")
-  MESSAGE(STATUS "      Boost lib path: ${Boost_LIBRARY_DIRS}")
-
-  # Assume this is OK for the moment...
-  SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE TRUE)
-
-  IF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34)
-    # Boost 1.35 and above included a separate "system" component. In
-    # at least some versions, filesystem depends on system - and the
-    # Mac linker apparently does not figure this out. Therefore we
-    # need to link it explicitly, which means we need to find it
-    # first.
-    FIND_PACKAGE(Boost COMPONENTS system)
-    IF (NOT Boost_SYSTEM_FOUND)
-      MESSAGE(STATUS "Did NOT find Boost SYSTEM component - not building multithreaded test driver")
-      SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE FALSE)
-    ELSE (NOT Boost_SYSTEM_FOUND)
-      SET (Boost_system_lib "boost_system-mt")
-    ENDIF (NOT Boost_SYSTEM_FOUND)
+IF(NOT APPLE) # avoid looking for this on OSX, fails linking testdriver_mt with boost for now
+	FIND_PACKAGE(Boost COMPONENTS filesystem)
+	IF (NOT Boost_FILESYSTEM_FOUND)
+	  MESSAGE(STATUS "Boost filesystem or system component not found - not building multithreaded test driver")
+	ELSE (NOT Boost_FILESYSTEM_FOUND)
+	  MESSAGE(STATUS "Found Boost v${Boost_LIB_VERSION}: ${Boost_INCLUDE_DIRS}")
+	  MESSAGE(STATUS "      Boost lib path: ${Boost_LIBRARY_DIRS}")
+
+	  # Assume this is OK for the moment...
+	  SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE TRUE)
+
+	  IF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34)
+	    # Boost 1.35 and above included a separate "system" component. In
+	    # at least some versions, filesystem depends on system - and the
+	    # Mac linker apparently does not figure this out. Therefore we
+	    # need to link it explicitly, which means we need to find it
+	    # first.
+	    FIND_PACKAGE(Boost COMPONENTS system)
+	    IF (NOT Boost_SYSTEM_FOUND)
+	      MESSAGE(STATUS "Did NOT find Boost SYSTEM component - not building multithreaded test driver")
+	      SET (ZORBATEST_TESTDRIVER_MT_AVAILABLE FALSE)
+	    ELSE (NOT Boost_SYSTEM_FOUND)
+	      SET (Boost_system_lib "boost_system-mt")
+	    ENDIF (NOT Boost_SYSTEM_FOUND)
     
-  ENDIF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34)
-
-ENDIF (NOT Boost_FILESYSTEM_FOUND)
-
+	  ENDIF (Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION GREATER 34)
+
+	ENDIF (NOT Boost_FILESYSTEM_FOUND)
+ENDIF (APPLE)  
+  
+  
 IF (ZORBATEST_TESTDRIVER_MT_AVAILABLE)
   INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})