From: Diane Trout Date: Wed, 9 Aug 2006 00:24:59 +0000 (+0000) Subject: Add serialization library to FindBoost X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=commitdiff_plain;h=8fd52184e235c3336e40955211a35282e4ebbce2 Add serialization library to FindBoost and sort the boost library names. --- diff --git a/makelib/FindBoost.cmake b/makelib/FindBoost.cmake index 0cd5804..4efe30f 100644 --- a/makelib/FindBoost.cmake +++ b/makelib/FindBoost.cmake @@ -12,11 +12,11 @@ FIND_PATH(BOOST_INCLUDE_DIR boost/weak_ptr.hpp IF(MINGW) SET (BOOST_ROOT C:\\Boost) - FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY - libboost_unit_test_framework-mgw-s - ${BOOST_ROOT}\\lib ) - FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY_DEBUG - libboost_unit_test_framework-mgw-s + FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY + libboost_filesystem-mgw-s + PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY_DEBUG + libboost_filesystem-mgw-sd PATHS ${BOOST_ROOT}\\lib ) FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY libboost_program_options-mgw-s @@ -24,31 +24,41 @@ IF(MINGW) FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY_DEBUG libboost_program_options-mgw-sd PATHS ${BOOST_ROOT}\\lib ) - FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY - libboost_filesystem-mgw-s - PATHS ${BOOST_ROOT}\\lib ) - FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY_DEBUG - libboost_filesystem-mgw-sd - PATHS ${BOOST_ROOT}\\lib ) FIND_LIBRARY( BOOST_PYTHON_LIBRARY libboost_python-mgw PATHS ${BOOST_ROOT}\\lib ) FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG libboost_python-mgw-d PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY + libboost_serialization-mgw + PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY_DEBUG + libboost_python-mgw-d + PATHS ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY + libboost_unit_test_framework-mgw-s + ${BOOST_ROOT}\\lib ) + FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY_DEBUG + libboost_unit_test_framework-mgw-s + PATHS ${BOOST_ROOT}\\lib ) ELSE(MINGW) -FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY NAMES boost_unit_test_framework +FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY NAMES boost_filesystem PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY NAMES boost_program_options PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) -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 ) +FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY NAMES boost_serialization + PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) +FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY_DEBUG NAMES boost_serialization-d + PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) +FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY NAMES boost_unit_test_framework + PATHS /usr/lib /usr/local/lib C:\\Boost\\lib ) ENDIF(MINGW)