X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=makelib%2FFindBoost.cmake;h=440de2de720ae37917a24a2205ce36061bb2d884;hb=5e4c30bbdd87540257a0414bdb09d61ba9690ba8;hp=4efe30f486f56386033f654405626d1a23ec066a;hpb=8fd52184e235c3336e40955211a35282e4ebbce2;p=mussa.git

diff --git a/makelib/FindBoost.cmake b/makelib/FindBoost.cmake
index 4efe30f..440de2d 100644
--- a/makelib/FindBoost.cmake
+++ b/makelib/FindBoost.cmake
@@ -5,59 +5,96 @@
 
 FIND_PATH(BOOST_INCLUDE_DIR boost/weak_ptr.hpp 
                             /usr/include 
+                            /usr/include/boost-1_34
+                            /usr/include/boost-1_33
                             /usr/local/include
+                            /usr/local/include/boost-1_34
+                            /usr/local/include/boost-1_33
                             C:\\Boost\\Include
+                            C:\\Boost\\Include\\boost-1_34
                             C:\\Boost\\include\\boost-1_33_1 )
 
 
 IF(MINGW)
   SET (BOOST_ROOT C:\\Boost)
-  FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY 
+  FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY NAMES
                 libboost_filesystem-mgw-s
+                libboost_filesystem-mgw34-s-1_34
                 PATHS ${BOOST_ROOT}\\lib )
-  FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY_DEBUG 
+  FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY_DEBUG NAMES
                 libboost_filesystem-mgw-sd
+                libboost_filesystem-mgw34-s-1_34
                 PATHS ${BOOST_ROOT}\\lib )
-  FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY 
+  FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY NAMES
                 libboost_program_options-mgw-s
+                libboost_program_options-mgw34-s-1_34
                 PATHS ${BOOST_ROOT}\\lib )
-  FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY_DEBUG 
+  FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY_DEBUG NAMES 
                 libboost_program_options-mgw-sd
+                libboost_program_options-mgw34-sd-1_34
                 PATHS ${BOOST_ROOT}\\lib )
-  FIND_LIBRARY( BOOST_PYTHON_LIBRARY 
+  FIND_LIBRARY( BOOST_PYTHON_LIBRARY NAMES
                 libboost_python-mgw
+                libboost_python-mgw34-1_34
                 PATHS ${BOOST_ROOT}\\lib )
-  FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG 
+  FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG NAMES 
                 libboost_python-mgw-d
+                libboost_python-mgw34-d-1_34
                 PATHS ${BOOST_ROOT}\\lib )
-  FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY 
+  FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY NAMES
                 libboost_serialization-mgw
+                libboost_serialization-mgw34-1_34
                 PATHS ${BOOST_ROOT}\\lib )
-  FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY_DEBUG 
+  FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY_DEBUG NAMES
                 libboost_python-mgw-d
+                libboost_python-mgw34-d-1_34
                 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 
+  FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY NAMES
                 libboost_unit_test_framework-mgw-s
+                libboost_unit_test_framework-mgw34-s-1_34
+                PATHS ${BOOST_ROOT}\\lib )
+  FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY_DEBUG NAMES
+                libboost_unit_test_framework-mgw-sd
+                libboost_unit_test_framework-mgw34-sd-1_34
                 PATHS ${BOOST_ROOT}\\lib )
 ELSE(MINGW)
 
 
-FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY NAMES boost_filesystem
+FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY NAMES 
+              boost_filesystem
+              boost_filesystem-40
+              PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
+FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY NAMES 
+              boost_program_options
+              boost_program_options-40
+              PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
+FIND_LIBRARY( BOOST_PYTHON_LIBRARY NAMES 
+              boost_python
+              boost_python-40
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY NAMES boost_program_options
+FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG NAMES 
+              boost_python-d
+              boost_python-40-d
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_PYTHON_LIBRARY NAMES boost_python
+FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY NAMES 
+              boost_serialization
+              boost_serialization-40
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG NAMES boost_python-d
+FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY_DEBUG NAMES 
+              boost_serialization-d
+              boost_serialization-40-d
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY NAMES boost_serialization
+FIND_LIBRARY( BOOST_SIGNALS_LIBRARY NAMES 
+              boost_signals
+              boost_signals-40
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY_DEBUG NAMES boost_serialization-d
+FIND_LIBRARY( BOOST_SIGNALS_LIBRARY_DEBUG NAMES 
+              boost_signals-d
+              boost_signals-40-d
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
-FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY NAMES boost_unit_test_framework 
+FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY NAMES 
+              boost_unit_test_framework 
+              boost_unit_test_framework-40
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
 
 ENDIF(MINGW)