* 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:
parent
350950cff8
commit
748d54b549
|
@ -39,6 +39,14 @@ FIND_PACKAGE(HURRICANE REQUIRED)
|
||||||
FIND_PACKAGE(CORIOLIS REQUIRED)
|
FIND_PACKAGE(CORIOLIS REQUIRED)
|
||||||
|
|
||||||
SET_LIB_LINK_MODE()
|
SET_LIB_LINK_MODE()
|
||||||
|
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}")
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(src)
|
ADD_SUBDIRECTORY(src)
|
||||||
ADD_SUBDIRECTORY(cmake_modules)
|
ADD_SUBDIRECTORY(cmake_modules)
|
||||||
|
|
|
@ -35,8 +35,23 @@
|
||||||
set ( intervalTreeCpps intervalTree/src/IntervalTree.cpp )
|
set ( intervalTreeCpps intervalTree/src/IntervalTree.cpp )
|
||||||
qt4_wrap_cpp ( mocCpps ${mocIncludes} )
|
qt4_wrap_cpp ( mocCpps ${mocIncludes} )
|
||||||
|
|
||||||
add_library ( equinox ${cpps} ${mocCpps} )
|
add_library ( equinox ${cpps} ${mocCpps} )
|
||||||
add_library (intervalTree ${intervalTreeCpps} )
|
target_link_libraries ( equinox ${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
|
||||||
|
)
|
||||||
|
add_library ( intervalTree ${intervalTreeCpps} )
|
||||||
|
|
||||||
install ( TARGETS equinox intervalTree DESTINATION lib${LIB_SUFFIX} )
|
install ( TARGETS equinox intervalTree DESTINATION lib${LIB_SUFFIX} )
|
||||||
install ( FILES ${includes}
|
install ( FILES ${includes}
|
||||||
${mocIncludes}
|
${mocIncludes}
|
||||||
|
|
Loading…
Reference in New Issue