projects
/
mussa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store Sequence sequence location in a shared_ptr class
[mussa.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 1cb466b6b69fb270e29c3f8748f8c755d1959f00..747e7e4cf1b59bb69bf262da61579f0226a35172 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-24,6
+24,8
@@
FIND_PACKAGE(OpenGL)
FIND_PACKAGE(Boost)
FIND_PACKAGE(PythonLibs)
FIND_PACKAGE(Boost)
FIND_PACKAGE(PythonLibs)
+SET(USE_PYTHON 1)
+
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}
${QT_INCLUDES}
${BOOST_INCLUDE_DIR} )
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}
${QT_INCLUDES}
${BOOST_INCLUDE_DIR} )
@@
-32,6
+34,11
@@
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}
# all of our source files al relative to the root of our project
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
ADD_SUBDIRECTORY( doc )
# all of our source files al relative to the root of our project
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
ADD_SUBDIRECTORY( doc )
+IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/paircomp)
+ MESSAGE(STATUS "Found paircomp")
+ SET(USE_PAIRCOMP 1)
+ ADD_SUBDIRECTORY( paircomp )
+ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/paircomp)
ADD_SUBDIRECTORY( alg )
ADD_SUBDIRECTORY( qui )
ADD_SUBDIRECTORY( py )
ADD_SUBDIRECTORY( alg )
ADD_SUBDIRECTORY( qui )
ADD_SUBDIRECTORY( py )
@@
-41,28
+48,33
@@
SET(MAIN_SOURCES
ADD_EXECUTABLE(mussagl WIN32 MACOSX_BUNDLE ${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
# 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
mussa_core
${QT_LIBRARIES}
# Including QT_LIBS twice is for dealing with linking dependancies
- # related to Qt Assistant Client
.
+ # related to Qt Assistant Client
on windows
${QT_LIBRARIES}
${BOOST_FILESYSTEM_LIBRARY}
${BOOST_SERIALIZATION_LIBRARY}
${BOOST_PROGRAM_OPTIONS_LIBRARY}
${QT_LIBRARIES}
${BOOST_FILESYSTEM_LIBRARY}
${BOOST_SERIALIZATION_LIBRARY}
${BOOST_PROGRAM_OPTIONS_LIBRARY}
- ${BOOST_PYTHON_LIBRARY}
- ${PYTHON_LIBRARIES}
- ${PYTHON_LINK_LIBRARIES}
${OPENGL_gl_LIBRARY}
)
${OPENGL_gl_LIBRARY}
)
+IF(USE_PYTHON)
+ SET(PYTHON_CFLAGS "-DUSE_PYTHON")
+ TARGET_LINK_LIBRARIES(mussagl
+ mussa_py
+ ${QT_LIBRARIES}
+ mussaqui_py
+ ${BOOST_PYTHON_LIBRARY}
+ ${PYTHON_LIBRARIES}
+ ${PYTHON_LINK_LIBRARIES})
+ENDIF(USE_PYTHON)
+
+
GET_MUSSA_COMPILE_FLAGS(MAIN_CFLAGS)
GET_MUSSA_LINK_FLAGS(MAIN_LDFLAGS)
GET_MUSSA_COMPILE_FLAGS(MAIN_CFLAGS)
GET_MUSSA_LINK_FLAGS(MAIN_LDFLAGS)
@@
-84,7
+96,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_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})
SET(APP_DIR ${CMAKE_BINARY_DIR}/mussagl.app/Contents)
SET(RESOURCE_DIR ${APP_DIR}/Resources})