projects
/
mussa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a426794
)
FindBoost.cmake boost 1.34 Windows mingw patch
author
Brandon King
<kingb@caltech.edu>
Tue, 22 May 2007 22:30:49 +0000
(22:30 +0000)
committer
Brandon King
<kingb@caltech.edu>
Tue, 22 May 2007 22:30:49 +0000
(22:30 +0000)
makelib/FindBoost.cmake
patch
|
blob
|
history
diff --git
a/makelib/FindBoost.cmake
b/makelib/FindBoost.cmake
index e65bb30443c94d5860ab890c9480208b9130689e..440de2de720ae37917a24a2205ce36061bb2d884 100644
(file)
--- a/
makelib/FindBoost.cmake
+++ b/
makelib/FindBoost.cmake
@@
-17,35
+17,45
@@
FIND_PATH(BOOST_INCLUDE_DIR boost/weak_ptr.hpp
IF(MINGW)
SET (BOOST_ROOT C:\\Boost)
IF(MINGW)
SET (BOOST_ROOT C:\\Boost)
- FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY
+ FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY
NAMES
libboost_filesystem-mgw-s
libboost_filesystem-mgw-s
+ libboost_filesystem-mgw34-s-1_34
PATHS ${BOOST_ROOT}\\lib )
PATHS ${BOOST_ROOT}\\lib )
- FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY_DEBUG
+ FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY_DEBUG
NAMES
libboost_filesystem-mgw-sd
libboost_filesystem-mgw-sd
+ libboost_filesystem-mgw34-s-1_34
PATHS ${BOOST_ROOT}\\lib )
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-mgw-s
+ libboost_program_options-mgw34-s-1_34
PATHS ${BOOST_ROOT}\\lib )
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-mgw-sd
+ libboost_program_options-mgw34-sd-1_34
PATHS ${BOOST_ROOT}\\lib )
PATHS ${BOOST_ROOT}\\lib )
- FIND_LIBRARY( BOOST_PYTHON_LIBRARY
+ FIND_LIBRARY( BOOST_PYTHON_LIBRARY
NAMES
libboost_python-mgw
libboost_python-mgw
+ libboost_python-mgw34-1_34
PATHS ${BOOST_ROOT}\\lib )
PATHS ${BOOST_ROOT}\\lib )
- FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG
+ FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG
NAMES
libboost_python-mgw-d
libboost_python-mgw-d
+ libboost_python-mgw34-d-1_34
PATHS ${BOOST_ROOT}\\lib )
PATHS ${BOOST_ROOT}\\lib )
- FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY
+ FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY
NAMES
libboost_serialization-mgw
libboost_serialization-mgw
+ libboost_serialization-mgw34-1_34
PATHS ${BOOST_ROOT}\\lib )
PATHS ${BOOST_ROOT}\\lib )
- FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY_DEBUG
+ FIND_LIBRARY( BOOST_SERIALIZATION_LIBRARY_DEBUG
NAMES
libboost_python-mgw-d
libboost_python-mgw-d
+ libboost_python-mgw34-d-1_34
PATHS ${BOOST_ROOT}\\lib )
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-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)
PATHS ${BOOST_ROOT}\\lib )
ELSE(MINGW)