Add serialization library to FindBoost

and sort the boost library names.

diff --git a/makelib/FindBoost.cmake b/makelib/FindBoost.cmake
index 0cd5804f91e86f9208bc0b4ff366011ec3c7f113..4efe30f486f56386033f654405626d1a23ec066a 100644 (file)
--- 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)