X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=blobdiff_plain;f=makelib%2FFindBoost.cmake;h=dd2dab97f0ce24fa9e8fcef2600b6a704e5eaee0;hb=81ff00e4000c26b0a6e4577d5d2130ce7b524208;hp=c69b394e364629feb23b4fe9f982432052ed909c;hpb=f0cceadf945765d90a18e9e6369ef70879a3f617;p=mussa.git

diff --git a/makelib/FindBoost.cmake b/makelib/FindBoost.cmake
index c69b394..dd2dab9 100644
--- a/makelib/FindBoost.cmake
+++ b/makelib/FindBoost.cmake
@@ -5,49 +5,117 @@
 
 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 )
 
+FIND_PACKAGE(PythonInterp)
+IF(PYTHONINTERP_FOUND)
+  STRING(REGEX MATCH "[0-9]\\.[0-9]$" PYVER ${PYTHON_EXECUTABLE})
+ENDIF(PYTHONINTERP_FOUND)
 
 IF(MINGW)
   SET (BOOST_ROOT C:\\Boost)
-  FIND_PATH( BOOST_UNIT_TEST_LIBRARY 
-             libboost_unit_test_framework-mgw-s.lib 
-             ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_UNIT_TEST_LIBRARY_DEBUG 
-             libboost_unit_test_framework-mgw-sd.lib 
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_PROGRAM_OPTIONS_LIBRARY 
-             libboost_program_options-mgw-s.lib
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_PROGRAM_OPTIONS_LIBRARY_DEBUG 
-             libboost_program_options-sd.lib
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_FILESYSTEM_LIBRARY 
-             libboost_filesystem-mgw-s.lib
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_FILESYSTEM_LIBRARY_DEBUG 
-             libboost_filesystem-mgw-sd.lib
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_PYTHON_LIBRARY 
-             libboost_python-mgw.lib
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_PYTHON_LIBRARY_DEBUG 
-             libboost_python-mgw-d.lib
-             PATHS ${BOOST_ROOT}\\lib )
+  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 NAMES
+                libboost_filesystem-mgw-sd
+                libboost_filesystem-mgw34-s-1_34
+                PATHS ${BOOST_ROOT}\\lib )
+  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 NAMES 
+                libboost_program_options-mgw-sd
+                libboost_program_options-mgw34-sd-1_34
+                PATHS ${BOOST_ROOT}\\lib )
+  IF(PYTHONINTERP_FOUND)
+    FIND_LIBRARY( BOOST_PYTHON_LIBRARY NAMES
+                  libboost_python${PYVER}-mgw
+                  libboost_python${PYVER}-mgw34-1_34
+                  libboost_python-mgw
+                  libboost_python-mgw34-1_34
+                  PATHS ${BOOST_ROOT}\\lib )
+    FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG NAMES 
+                  libboost_python${PYVER}-mgw-d
+                  libboost_python${PYVER}-mgw34-d-1_34
+                  libboost_python-mgw-d
+                  libboost_python-mgw34-d-1_34
+                  PATHS ${BOOST_ROOT}\\lib )
+  ENDIF(PYTHONINTERP_FOUND)
+  FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY NAMES
+                libboost_serialization-mgw
+                libboost_serialization-mgw34-1_34
+                PATHS ${BOOST_ROOT}\\lib )
+  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 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_UNIT_TEST_LIBRARY NAMES boost_unit_test_framework 
+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
+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_FILESYSTEM_LIBRARY NAMES boost_filesystem
+IF(PYTHONINTERP_FOUND)
+  FIND_LIBRARY( BOOST_PYTHON_LIBRARY NAMES 
+                boost_python${PYVER}
+                boost_python${PYVER}-40
+                boost_python${PYVER}-gcc40-1_34
+                boost_python
+                boost_python-40
+                boost_python-gcc40-1_34
+                PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
+  FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG NAMES 
+                boost_python${PYVER}-d
+                boost_python${PYVER}-40-d
+                boost_python${PYVER}-gcc40-d
+                boost_python${PYVER}-gcc40-d-1_34
+                boost_python-d
+                boost_python-40-d
+                boost_python-gcc40-d-1_34
+                PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
+ENDIF(PYTHONINTERP_FOUND)
+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 NAMES boost_python
+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_PYTHON_LIBRARY_DEBUG NAMES boost_python-d
+FIND_LIBRARY( BOOST_SIGNALS_LIBRARY NAMES 
+              boost_signals
+              boost_signals-40
+              PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
+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 
+              boost_unit_test_framework-40
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
 
 ENDIF(MINGW)