From 4d9b6b465c7a0decd91e04337f01246948472f89 Mon Sep 17 00:00:00 2001 From: Damien Dupuis Date: Wed, 7 Jul 2010 13:49:20 +0000 Subject: [PATCH] Readd the TARGET_LINK_LIBRARIES command in Cmake files (to compile on macosx) --- vlsisapd/src/agds/src/CMakeLists.txt | 1 + vlsisapd/src/cif/src/CMakeLists.txt | 1 + vlsisapd/src/configuration/src/CMakeLists.txt | 11 ++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/vlsisapd/src/agds/src/CMakeLists.txt b/vlsisapd/src/agds/src/CMakeLists.txt index 0d22fba9..4cd15d7d 100644 --- a/vlsisapd/src/agds/src/CMakeLists.txt +++ b/vlsisapd/src/agds/src/CMakeLists.txt @@ -24,6 +24,7 @@ IF(Boost_FOUND) COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" PREFIX "" ) + TARGET_LINK_LIBRARIES(pyAGDS agds ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) INSTALL(TARGETS pyAGDS DESTINATION ${PYTHON_SITE_PACKAGES}) ENDIF(Boost_FOUND) diff --git a/vlsisapd/src/cif/src/CMakeLists.txt b/vlsisapd/src/cif/src/CMakeLists.txt index 40bf4cf7..2f3a02e9 100644 --- a/vlsisapd/src/cif/src/CMakeLists.txt +++ b/vlsisapd/src/cif/src/CMakeLists.txt @@ -21,6 +21,7 @@ IF(Boost_FOUND) COMPILE_FLAGS "${COMPILE_FLAGS} -D__PYTHON_MODULE__=1" PREFIX "" ) + TARGET_LINK_LIBRARIES(pyCIF cif ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) INSTALL(TARGETS pyCIF DESTINATION ${PYTHON_SITE_PACKAGES}) ENDIF(Boost_FOUND) diff --git a/vlsisapd/src/configuration/src/CMakeLists.txt b/vlsisapd/src/configuration/src/CMakeLists.txt index 8d9c0abd..50deb934 100644 --- a/vlsisapd/src/configuration/src/CMakeLists.txt +++ b/vlsisapd/src/configuration/src/CMakeLists.txt @@ -27,12 +27,13 @@ qt4_wrap_cpp ( mocCpps ${mocIncludes} ) add_library ( configuration ${cpps} ${mocCpps} ) - add_executable ( vlsisapd-conf-editor ${editorcpp} ) - target_link_libraries ( vlsisapd-conf-editor configuration ${QT_LIBRARIES} - ${Boost_LIBRARIES} - ${PYTHON_LIBRARIES} - ${LIBXML2_LIBRARIES} + target_link_libraries ( configuration ${QT_LIBRARIES} + ${Boost_LIBRARIES} + ${PYTHON_LIBRARIES} + ${LIBXML2_LIBRARIES} ) + add_executable ( vlsisapd-conf-editor ${editorcpp} ) + target_link_libraries ( vlsisapd-conf-editor configuration ) install ( TARGETS configuration DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS vlsisapd-conf-editor DESTINATION bin )