Build universal binaries on OS X

[mussa.git] / qui / CMakeLists.txt

diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt
index a7634972920cd7c7097546eca611535bdd9d3d0c..bead7f8036017707a46d3e845fcf4ae34408b494 100644 (file)
--- a/qui/CMakeLists.txt
+++ b/qui/CMakeLists.txt
@@ -13,6 +13,8 @@ FIND_PACKAGE(OpenGL)
 FIND_PACKAGE(Boost)
 FIND_PACKAGE(PythonLibs)
 
+INCLUDE( Platform )
+
 SET(MOC_HEADERS
       ImageSaveDialog.hpp     
       ImageScaler.hpp         
@@ -69,7 +71,9 @@ QT4_ADD_RESOURCES(RCC_SOURCES ${RCCS})
 QT4_WRAP_CPP(MOC_SOURCES ${MOC_HEADERS})
 SET(SOURCES  ${MOC_SOURCES} ${GUI_SOURCES} ${RCC_SOURCES} ${MAIN_SOURCES})
 
-# these are really only needed for gcc on AMD64
+GET_MUSSA_COMPILE_FLAGS(QUI_CFLAGS)
+GET_MUSSA_LINK_FLAGS(QUI_LDFLAGS)
+
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} 
                     ${QT_INCLUDES}
                     ${BOOST_INCLUDE_DIR} )
@@ -88,11 +92,9 @@ TARGET_LINK_LIBRARIES(mussagl
                         ${BOOST_PROGRAM_OPTIONS_LIBRARY}
                         ${BOOST_FILESYSTEM_LIBRARY}
                       )
+
 IF(USE_PYTHON)
-  SET_SOURCE_FILES_PROPERTIES(${SOURCES}
-                              PROPERTIES
-                              COMPILE_FLAGS "-DUSE_PYTHON=1"
-                             )
+  SET(CFLAGS "-DUSE_PYTHON=1 ${CFLAGS}")
   TARGET_LINK_LIBRARIES(mussagl
                           ${BOOST_PYTHON_LIBRARY}
                           optimized ${PYTHON_LIBRARIES}
@@ -100,6 +102,16 @@ IF(USE_PYTHON)
                         )
 ENDIF(USE_PYTHON)
 
+SET_SOURCE_FILES_PROPERTIES(
+  ${SOURCES} ${MAIN_SOURCES}
+  PROPERTIES
+  COMPILE_FLAGS "${QUI_CFLAGS}"
+)
+SET_TARGET_PROPERTIES(
+  mussagl mussa_qui PROPERTIES
+  COMPILE_FLAGS "${QUI_CFLAGS}"
+  LINK_FLAGS "${QUI_LDFLAGS}"
+)
 
 # we need Cocoa in order to find where our base directory is (AKA bundle)
 IF(APPLE)
@@ -119,9 +131,4 @@ IF(APPLE)
                    )
 ENDIF(APPLE)
 
-# these are needed for AMD64 systems but don't hurt on 32bit
-SET_SOURCE_FILES_PROPERTIES(${SOURCES} PROPERTIES COMPILE_FLAGS "-fPIC")
-SET_TARGET_PROPERTIES(mussa_qui PROPERTIES COMPILE_FLAGS "-fPIC")
-SET_TARGET_PROPERTIES(mussagl PROPERTIES COMPILE_FLAGS "-fPIC")
-
 ADD_SUBDIRECTORY( test )