rename _LIB to _LIBRARY to be more consistent with cmake

diff --git a/alg/test/CMakeLists.txt b/alg/test/CMakeLists.txt
index 3e1e43b27e29e6c24909ff365b4babd720e03eaa..a8694e71a606807a085c4b54432cc766d11bdc53 100644 (file)
--- 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 01169b51a45ea6fb3f61586948bd3497cdd45c4b..663c6cc20f1435d2fc2b4bf2bcccbf60bcdf5413 100644 (file)
--- 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 5e71bc636d096b5455b177256c00f942c986db1a..92e370be23ae1600cc46d56a4cbb36835aad5f7c 100644 (file)
--- 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 f01a15a5194502839db655d8a5f13a803abddcd1..6cb7d1cd47220666754b1f67f9f5901268abdde4 100644 (file)
--- 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}
                         )