From 35fc1bbe55b6d57b65dc1d0e609da73c9a3fc68c Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Sat, 8 Apr 2006 09:57:08 +0000 Subject: [PATCH] rename _LIB to _LIBRARY to be more consistent with cmake --- alg/test/CMakeLists.txt | 4 ++-- gui/CMakeLists.txt | 2 +- makelib/FindBoost.cmake | 12 +++++++++--- qui/CMakeLists.txt | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/alg/test/CMakeLists.txt b/alg/test/CMakeLists.txt index 3e1e43b..a8694e7 100644 --- a/alg/test/CMakeLists.txt +++ b/alg/test/CMakeLists.txt @@ -16,7 +16,7 @@ ADD_EXECUTABLE(unittest ${SOURCES}) ADD_TEST(core_test ${CMAKE_BINARY_DIR}/alg/test/unittest) LINK_DIRECTORIES(${MUSSA_BINARY_DIR}/alg}) TARGET_LINK_LIBRARIES(unittest - ${BOOST_UNIT_TEST_LIB} - ${BOOST_FILESYSTEM_LIB} + ${BOOST_UNIT_TEST_LIBRARY} + ${BOOST_FILESYSTEM_LIBRARY} mussa_core ${OPENGL_gl_LIBRARY}) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 01169b5..663c6cc 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -26,7 +26,7 @@ IF(FLTK_FOUND) LINK_DIRECTORIES(${MUSSA_BINARY_DIR}/alg) TARGET_LINK_LIBRARIES(mussa_fltk mussa_core - ${BOOST_FILESYSTEM_LIB} + ${BOOST_FILESYSTEM_LIBRARY} ${FLTK_LIBRARY}) ELSE(FLTK_FOUND) MESSAGE(STATUS "Not building old FTLK version") diff --git a/makelib/FindBoost.cmake b/makelib/FindBoost.cmake index 5e71bc6..92e370b 100644 --- a/makelib/FindBoost.cmake +++ b/makelib/FindBoost.cmake @@ -5,12 +5,18 @@ FIND_PATH(BOOST_INCLUDE_DIR weak_ptr.hpp /usr/include /usr/local/include ) -FIND_LIBRARY( BOOST_UNIT_TEST_LIB NAMES boost_unit_test_framework +FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY NAMES boost_unit_test_framework PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) -FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIB NAMES boost_program_options +FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY NAMES boost_program_options PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) -FIND_LIBRARY( BOOST_FILESYSTEM_LIB NAMES boost_filesystem +FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY NAMES boost_filesystem PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) +FIND_LIBRARY( BOOST_PYTHON_LIBRARY NAMES boost_python + PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) +FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG NAMES boost_python-d + PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) + + IF (BOOST_INCLUDE_DIR) SET(BOOST_FOUND TRUE) diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt index f01a15a..6cb7d1c 100644 --- a/qui/CMakeLists.txt +++ b/qui/CMakeLists.txt @@ -65,7 +65,7 @@ TARGET_LINK_LIBRARIES(mussagl ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY} - ${BOOST_PROGRAM_OPTIONS_LIB} - ${BOOST_FILESYSTEM_LIB} + ${BOOST_PROGRAM_OPTIONS_LIBRARY} + ${BOOST_FILESYSTEM_LIBRARY} ) -- 2.30.2