summaryrefslogtreecommitdiffstats
path: root/Modules/FindBoost.cmake
diff options
context:
space:
mode:
authorPhilip Lowman <philip@yhbt.com>2009-01-15 07:07:03 (GMT)
committerPhilip Lowman <philip@yhbt.com>2009-01-15 07:07:03 (GMT)
commit20f2a086d370dc41aeab2bb25a3fd3573b72dce0 (patch)
tree5f51e3704d66e4e91c6420c1301cc524edb534f8 /Modules/FindBoost.cmake
parent0864c71c3b22096ec9c8abc4557280c8a244fe19 (diff)
downloadCMake-20f2a086d370dc41aeab2bb25a3fd3573b72dce0.zip
CMake-20f2a086d370dc41aeab2bb25a3fd3573b72dce0.tar.gz
CMake-20f2a086d370dc41aeab2bb25a3fd3573b72dce0.tar.bz2
BUG: fixed bug #7529: FindBoost fails to find boost on SuSE 11.0 due to GCC
reporting version x.y and not x.y.z
Diffstat (limited to 'Modules/FindBoost.cmake')
-rw-r--r--Modules/FindBoost.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 21c2fae..8958eb9 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -459,7 +459,7 @@ ELSE (_boost_IN_CACHE)
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)
@@ -473,7 +473,7 @@ ELSE (_boost_IN_CACHE)
ARGS ${CMAKE_CXX_COMPILER_ARG1} -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)