jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* All tools: 

- Bug: target_link_libraries() must be put back for OSX Snow Leopard
        (doesn't seems to affect Leopard). As I do not have an OSX under
        my hand it's untested and is likely to fail at that point.
This commit is contained in:
Jean-Paul Chaput 2010-07-12 15:12:20 +00:00
parent e19378e8f0
commit 350950cff8
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kite/CMakeLists.txt
View File

@ -56,7 +56,14 @@ FIND_PACKAGE(KNIK REQUIRED)
FIND_PACKAGE(KATABATIC REQUIRED)
SET_LIB_LINK_MODE()
FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem REQUIRED)
SET(Boost_USE_STATIC_LIBS ON)
MESSAGE(STATUS "Always uses Boost static libraries.")
FIND_PACKAGE(Boost 1.35.0 COMPONENTS program_options filesystem system regex python)
IF(NOT Boost_FOUND)
FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options filesystem python regex REQUIRED)
ENDIF(NOT Boost_FOUND)
MESSAGE(STATUS "Found Boost libraries ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIR}")
MESSAGE(STATUS " ${Boost_LIBRARIES}")
IF(CHECK_DATABASE)
ADD_DEFINITIONS(-DCHECK_DATABASE)

47
kite/src/CMakeLists.txt
View File

@ -66,29 +66,30 @@
qt4_wrap_cpp ( mocCpps ${mocIncludes} )
add_library ( kite ${cpps} ${mocCpps} )
add_executable ( kite-text ${kitecpps} )
target_link_libraries ( kite-text kite
${KATABATIC_LIBRARIES}
${KNIK_LIBRARIES}
${CORIOLIS_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_LIBRARIES}
${CIF_LIBRARY}
${AGDS_LIBRARY}
${CONFIGURATION_LIBRARY}
${QT_LIBRARIES}
${LEFDEF_LIBRARIES}
${OA_LIBRARIES}
${Boost_LIBRARIES}
${PYTHON_LIBRARIES}
-lutil
${LIBXML2_LIBRARIES}
add_library ( kite ${cpps} ${mocCpps} )
target_link_libraries ( kite ${KATABATIC_LIBRARIES}
${KNIK_LIBRARIES}
${NIMBUS_LIBRARIES}
${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES}
${CONFIGURATION_LIBRARY}
${CIF_LIBRARY}
${AGDS_LIBRARY}
${LEFDEF_LIBRARIES}
${OA_LIBRARIES}
${QT_LIBRARIES}
${Boost_LIBRARIES}
${LIBXML2_LIBRARIES}
${PYTHON_LIBRARIES} -lutil
)
install ( TARGETS kite DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS kite-text DESTINATION bin )
install ( FILES ${includes}
${mocIncludes} DESTINATION include/coriolis2/kite )
add_executable ( kite-text ${kitecpps} )
target_link_libraries ( kite-text kite )
install ( TARGETS kite DESTINATION lib${LIB_SUFFIX} )
install ( TARGETS kite-text DESTINATION bin )
install ( FILES ${includes}
${mocIncludes} DESTINATION include/coriolis2/kite )