[Cmake-commits] [cmake-commits] lowman committed FindBoost.cmake 1.36 1.37
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Mar 16 22:28:39 EDT 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv9429
Modified Files:
FindBoost.cmake
Log Message:
BUG: Eliminates detection of Boost system library prior to 1.35 (see issue #8734)
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** FindBoost.cmake 13 Mar 2009 01:06:08 -0000 1.36
--- FindBoost.cmake 17 Mar 2009 02:28:35 -0000 1.37
***************
*** 300,306 ****
set(Boost_ERROR_REASON)
-
SET( _boost_IN_CACHE TRUE)
IF(Boost_INCLUDE_DIR)
FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
STRING(TOUPPER ${COMPONENT} COMPONENT)
--- 300,316 ----
set(Boost_ERROR_REASON)
SET( _boost_IN_CACHE TRUE)
IF(Boost_INCLUDE_DIR)
+
+ # On versions < 1.35, remove the System library from the considered list
+ # since it wasn't added until 1.35.
+ if(Boost_VERSION)
+ math(EXPR _boost_maj "${Boost_VERSION} / 100000")
+ math(EXPR _boost_min "${Boost_VERSION} / 100 % 1000")
+ if(${_boost_maj}.${_boost_min} VERSION_LESS 1.35)
+ list(REMOVE_ITEM Boost_FIND_COMPONENTS system)
+ endif()
+ endif()
+
FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
STRING(TOUPPER ${COMPONENT} COMPONENT)
More information about the Cmake-commits
mailing list