diff options
| author | Philip Lowman <philip@yhbt.com> | 2009-08-20 02:28:46 (GMT) |
|---|---|---|
| committer | Philip Lowman <philip@yhbt.com> | 2009-08-20 02:28:46 (GMT) |
| commit | 4bf4cbd8a24de72a543ee32f30b8bb58cabd98c8 (patch) | |
| tree | e71dea3f4629c480a5b22218d22bea6505dc13ba /Modules/FindBoost.cmake | |
| parent | 0470a0c1adf5a779b3e11bbe087e7fbb48e88485 (diff) | |
| download | CMake-4bf4cbd8a24de72a543ee32f30b8bb58cabd98c8.zip CMake-4bf4cbd8a24de72a543ee32f30b8bb58cabd98c8.tar.gz CMake-4bf4cbd8a24de72a543ee32f30b8bb58cabd98c8.tar.bz2 | |
Add Boost 1.39 & 1.40. Move ${Boost_INCLUDE_DIR}/lib to front of library search.
Diffstat (limited to 'Modules/FindBoost.cmake')
| -rw-r--r-- | Modules/FindBoost.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 8900162..7dea995 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -57,7 +57,8 @@ # # 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.37, 1.37.0, 1.38, 1.38.0 +# 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0, +# 1.40, 1.40.0 # # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should # add both 1.x and 1.x.0 as shown above. Official Boost include directories @@ -271,7 +272,7 @@ 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.38.0" "1.38" "1.37.0" "1.37" + "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "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) @@ -636,11 +637,11 @@ ELSE (_boost_IN_CACHE) # ------------------------------------------------------------------------ SET(_boost_LIBRARIES_SEARCH_DIRS + ${Boost_INCLUDE_DIR}/lib C:/boost/lib C:/boost "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib" "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}/lib" - ${Boost_INCLUDE_DIR}/lib "$ENV{ProgramFiles}/boost" /sw/local/lib ) |