From: Diane Trout Date: Fri, 28 Jul 2006 21:56:37 +0000 (+0000) Subject: Use CMAKE_BINARY_DIR instead of the very wrong MUSSA_BINARY_DIR X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=commitdiff_plain;h=e40b7bc7e27c6fb87cbef0e30b93f2c1b0b51706 Use CMAKE_BINARY_DIR instead of the very wrong MUSSA_BINARY_DIR --- diff --git a/alg/test/CMakeLists.txt b/alg/test/CMakeLists.txt index 4926dc5..8a34c1c 100644 --- a/alg/test/CMakeLists.txt +++ b/alg/test/CMakeLists.txt @@ -19,7 +19,7 @@ SET_SOURCE_FILES_PROPERTIES( ADD_EXECUTABLE(unittest ${SOURCES}) ADD_TEST(core_test ${CMAKE_BINARY_DIR}/alg/test/unittest) -LINK_DIRECTORIES(${MUSSA_BINARY_DIR}/alg}) +LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/alg}) TARGET_LINK_LIBRARIES(unittest ${BOOST_UNIT_TEST_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY} diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index e81ea92..84702e1 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -25,7 +25,7 @@ SET(SOURCES IF(FLTK_FOUND) ADD_EXECUTABLE(mussa_fltk WIN32 MACOSX_BUNDLE ${SOURCES}) - LINK_DIRECTORIES(${MUSSA_BINARY_DIR}/alg) + LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/alg) TARGET_LINK_LIBRARIES(mussa_fltk mussa_core ${BOOST_FILESYSTEM_LIBRARY} diff --git a/py/CMakeLists.txt b/py/CMakeLists.txt index 8c1c6cf..151f7ac 100644 --- a/py/CMakeLists.txt +++ b/py/CMakeLists.txt @@ -28,7 +28,7 @@ IF(BOOST_PYTHON_LIBRARY) ADD_CUSTOM_TARGET(mussa.so ALL COMMAND cp libmussa.so mussa.so DEPENDS mussa) - LINK_DIRECTORIES(${MUSSA_BINARY_DIR}/alg) + LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/alg) TARGET_LINK_LIBRARIES(mussa mussa_core mussa_qui diff --git a/py/test/CMakeLists.txt b/py/test/CMakeLists.txt index e189ec9..8957b7c 100644 --- a/py/test/CMakeLists.txt +++ b/py/test/CMakeLists.txt @@ -15,7 +15,7 @@ SET_SOURCE_FILES_PROPERTIES( ADD_EXECUTABLE(mussa_python_test ${SOURCES}) ADD_TEST(mussa_python_test ${CMAKE_BINARY_DIR}/py/test/mussa_python_test) -LINK_DIRECTORIES(${MUSSA_BINARY_DIR}/alg}) +LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/alg}) TARGET_LINK_LIBRARIES(mussa_python_test mussa_core mussa_qui