diff options
| author | Brad King <brad.king@kitware.com> | 2008-10-09 21:04:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-10-09 21:04:11 (GMT) |
| commit | db4f2bdffce5088ab8d8e1cd2570f686eb334f2f (patch) | |
| tree | b2af81a8abe6f14b50ff60e2d42913c5b96362d4 | |
| parent | ad44a41a187fc3a1b829397e1c9f7c5f305c084b (diff) | |
| download | CMake-db4f2bdffce5088ab8d8e1cd2570f686eb334f2f.zip CMake-db4f2bdffce5088ab8d8e1cd2570f686eb334f2f.tar.gz CMake-db4f2bdffce5088ab8d8e1cd2570f686eb334f2f.tar.bz2 | |
BUG: Avoid boost versions less than required
Construction of a list of candidate versions used to produce search
paths now discards versions less than requested by the user.
See issue #7783.
| -rw-r--r-- | Modules/FindBoost.cmake | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index c0f09b2..ec5d1c3 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -94,20 +94,37 @@ OPTION(Boost_USE_MULTITHREADED "Use the multithreaded versions of the Boost libraries" ON) -if (Boost_FIND_VERSION_EXACT) - if (Boost_FIND_VERSION_PATCH) - set( _boost_TEST_VERSIONS - "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}") - else (Boost_FIND_VERSION_PATCH) - set( _boost_TEST_VERSIONS - "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.0" - "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}") - endif (Boost_FIND_VERSION_PATCH) -else (Boost_FIND_VERSION_EXACT) - set( _boost_TEST_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" ) -endif (Boost_FIND_VERSION_EXACT) +if(Boost_FIND_VERSION_EXACT) + # The version may appear in a directory with or without the patch + # level, even when the patch level is non-zero. + set(_boost_TEST_VERSIONS + "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}.${Boost_FIND_VERSION_PATCH}" + "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}") +else(Boost_FIND_VERSION_EXACT) + # 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") + set(_boost_TEST_VERSIONS) + if(Boost_FIND_VERSION) + set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}") + # Select acceptable versions. + foreach(version ${_Boost_KNOWN_VERSIONS}) + if(NOT "${version}" VERSION_LESS "${Boost_FIND_VERSION}") + # This version is high enough. + list(APPEND _boost_TEST_VERSIONS "${version}") + elseif("${version}.99" VERSION_EQUAL "${_Boost_FIND_VERSION_SHORT}.99") + # This version is a short-form for the requested version with + # the patch level dropped. + list(APPEND _boost_TEST_VERSIONS "${version}") + endif() + endforeach(version) + else(Boost_FIND_VERSION) + # Any version is acceptable. + set(_boost_TEST_VERSIONS "${_Boost_KNOWN_VERSIONS}") + endif(Boost_FIND_VERSION) +endif(Boost_FIND_VERSION_EXACT) # The reason that we failed to find Boost. This will be set to a # user-friendly message when we fail to find some necessary piece of |