Hi!
The attached patch fixes two issues in FindBoost.cmake:
*) Adds support for Boost version 1.37
*) Some versions of gcc report their version number as "major.minor" instead
of "major.minor.patch" and are therefore not recognized by FindBoost. By
making the ".patch" optional, cmake correctly identifies the compiler and
therefore the Boost libraries.
Can this be applied to the repository?
Kind regards,
Markus
--
Markus Grabner - Computer Graphics and Vision
Graz University of Technology, Inffeldgasse 16a/II, 8010 Graz, Austria
Phone: +43/316/873-5041, Fax: +43/316/873-5050
WWW: http://www.icg.tugraz.at/Members/grabner
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.15
diff -u -r1.15 FindBoost.cmake
--- FindBoost.cmake 9 Oct 2008 21:04:11 -0000 1.15
+++ FindBoost.cmake 11 Dec 2008 15:38:04 -0000
@@ -13,7 +13,7 @@
#
# Currently this module searches for the following version numbers:
# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1, 1.36,
-# 1.36.0, 1.36.1
+# 1.36.0, 1.36.1, 1.37, 1.37.0
#
# The components list needs to be the actual names of boost libraries, that is
# the part of the actual library files that differ on different libraries. So
@@ -36,7 +36,8 @@
# the boost include directory. The default list
# of version numbers is:
# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1,
-# 1.35, 1.35.0, 1.35.1, 1.36, 1.36.0, 1.36.1
+# 1.35, 1.35.0, 1.35.1, 1.36, 1.36.0, 1.36.1,
+# 1.37, 1.37.0
# If you want to look for an older or newer
# version set this variable to a list of
# strings, where each string contains a number, i.e.
@@ -104,8 +105,8 @@
# The user has not requested an exact version. Among known
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
- "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
- "1.34" "1.33.1" "1.33.0" "1.33")
+ "1.37.0", "1.37", "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35"
+ "1.34.1" "1.34.0" "1.34" "1.33.1" "1.33.0" "1.33")
set(_boost_TEST_VERSIONS)
if(Boost_FIND_VERSION)
set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
@@ -379,7 +380,7 @@
ARGS -dumpversion
OUTPUT_VARIABLE _boost_COMPILER_VERSION
)
- STRING(REGEX REPLACE "([0-9])\\.([0-9])\\.[0-9]" "\\1\\2"
+ STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
_boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
ENDIF(MINGW)
@@ -393,7 +394,7 @@
ARGS -dumpversion
OUTPUT_VARIABLE _boost_COMPILER_VERSION
)
- STRING(REGEX REPLACE "([0-9])\\.([0-9])\\.[0-9]" "\\1\\2"
+ STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
_boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
IF(APPLE)
IF(Boost_MINOR_VERSION)
_______________________________________________
CMake mailing list
[email protected]
http://www.cmake.org/mailman/listinfo/cmake
