Mussagl Version number updated to 1.0

[mussa.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80d5fd5cb0f80cf6d59ab0ce29f811ec60b0a7ec..6a3125991b83a5a4656c436ce6e17baff5922c02 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,28 +41,31 @@ SET(MAIN_SOURCES
 
 ADD_EXECUTABLE(mussagl WIN32 MACOSX_BUNDLE ${MAIN_SOURCES} )
 
-
-SET(PYTHON_CFLAGS "-DUSE_PYTHON")
-
 # For windows you need to go from library with the most dependencies
 # to the library with the least dependencies -diane
 TARGET_LINK_LIBRARIES(mussagl 
                         mussa_qui
-                        mussa_py
                         mussa_core
                         ${QT_LIBRARIES}
                         # Including QT_LIBS twice is for dealing with linking dependancies
-                       # related to Qt Assistant Client.
-                       ${QT_LIBRARIES}  
+                        # related to Qt Assistant Client on windows
+                        ${QT_LIBRARIES}  
                         ${BOOST_FILESYSTEM_LIBRARY}
                         ${BOOST_SERIALIZATION_LIBRARY}
                         ${BOOST_PROGRAM_OPTIONS_LIBRARY}
-                        ${BOOST_PYTHON_LIBRARY}
-                        ${PYTHON_LIBRARIES}
-                        ${PYTHON_LINK_LIBRARIES}
                         ${OPENGL_gl_LIBRARY}
                       )
 
+IF(USE_PYTHON)
+  SET(PYTHON_CFLAGS "-DUSE_PYTHON")
+  TARGET_LINK_LIBRARIES(mussagl
+        mussa_py
+        ${BOOST_PYTHON_LIBRARY}
+        ${PYTHON_LIBRARIES}
+        ${PYTHON_LINK_LIBRARIES})
+ENDIF(USE_PYTHON)
+
+
 GET_MUSSA_COMPILE_FLAGS(MAIN_CFLAGS)
 GET_MUSSA_LINK_FLAGS(MAIN_LDFLAGS)
 
@@ -84,7 +87,7 @@ IF(APPLE)
   SET(MACOSX_BUNDLE_BUNDLE_NAME "Mussa")
   SET(MACOSX_BUNDLE_LONG_VERSION_STRING "Mussa Copyright 2004-2006 California Institute of Technology")
   SET(MACOSX_BUNDLE_COPYRIGHT "Copyright 2004-2006 California Institute of Technology")
-  SET(MACOSX_BUNDLE_ICON_FILE "mussa")
+  SET(MACOSX_BUNDLE_ICON_FILE "mussa.icns")
 
   SET(APP_DIR ${CMAKE_BINARY_DIR}/mussagl.app/Contents)
   SET(RESOURCE_DIR ${APP_DIR}/Resources})