to make it easier to build under os x 10.5, stop making the ppc/i386

[mussa.git] / makelib / Platform.cmake

diff --git a/makelib/Platform.cmake b/makelib/Platform.cmake
index d1f326b800e475ec6cd9f20e19a2abbb10820e6e..4506c5f35345f174a10a8bd89b97aa6c2424d7b5 100644 (file)
--- a/makelib/Platform.cmake
+++ b/makelib/Platform.cmake
@@ -12,18 +12,23 @@ IF(PYTHONINTERP_FOUND)
                ARGS ${CMAKE_SOURCE_DIR}/makelib/python_config_var.py LINKFORSTATIC
                OUTPUT_VARIABLE PYTHON_LINKFORSTATIC )
 ELSE(PYTHONINTERP_FOUND)
-  SET(PYTHON_EXTRA_LIBRARIES "")
+  SET(PYTHON_LINK_LIBRARIES "")
   SET(PYTHON_LINKFORSTATIC "")               
 ENDIF(PYTHONINTERP_FOUND)
 
-MACRO(GET_MUSSA_COMPILE_FLAGS return)
- SET(return "") 
- IF(APPLE)
-   SET(${return}
-         ${${return}} 
-         "-isysroot /Developer/SDKS/MacOSX10.4u.sdk -arch ppc -arch i386 -I/usr/local/include"
-      )
- ENDIF(APPLE)
+MACRO(GET_MUSSA_COMPILE_FLAGS)
+  SET(${return} "")
+  # this define is needed for linking against the shared
+  # library version of the boost unit test framework version 1.34.1
+  # ADD_DEFINITIONS("-DBOOST_TEST_DYN_LINK") 
+  IF(APPLE)
+    #ADD_DEFINITIONS("-isysroot /Developer/SDKS/MacOSX10.4u.sdk -arch ppc -arch i386 -I/usr/local/include")
+  ENDIF(APPLE)
+  IF (UNIX AND NOT WIN32)
+    IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+      ADD_DEFINITIONS("-fPIC")
+    ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+  ENDIF(UNIX AND NOT WIN32)
 ENDMACRO(GET_MUSSA_COMPILE_FLAGS)
 
 MACRO(GET_MUSSA_LINK_FLAGS return)
@@ -31,7 +36,7 @@ MACRO(GET_MUSSA_LINK_FLAGS return)
  IF(APPLE)
    SET(${return}
          ${${return}}
-         "-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+         #"-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
       )
  ENDIF(APPLE)
 ENDMACRO(GET_MUSSA_LINK_FLAGS)