diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-21 12:37:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-21 12:37:11 (GMT) |
| commit | 8b83d1fdffeab9d24946552a9b8252c2e0dc4570 (patch) | |
| tree | 35978ac09ee59cbaa29b7702aeb2c2768be07648 /Modules | |
| parent | 3d48c5404cde1ca5f9956d9587f7d5b134a696eb (diff) | |
| parent | 19d92d5e6e79448337aface8ed40df78240d674b (diff) | |
| download | CMake-8b83d1fdffeab9d24946552a9b8252c2e0dc4570.zip CMake-8b83d1fdffeab9d24946552a9b8252c2e0dc4570.tar.gz CMake-8b83d1fdffeab9d24946552a9b8252c2e0dc4570.tar.bz2 | |
Merge topic 'find-boost-test-version'
19d92d5e6e FindBoost: provide the version in x.y.z format
186f69cf26 FindBoost: test version variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2638
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBoost.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index ccd245b..a336495 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -35,6 +35,7 @@ case results are reported in variables:: Boost_MAJOR_VERSION - Boost major version number (X in X.y.z) Boost_MINOR_VERSION - Boost minor version number (Y in x.Y.z) Boost_SUBMINOR_VERSION - Boost subminor version number (Z in x.y.Z) + Boost_VERSION_STRING - Boost version number in x.y.z format Boost_LIB_DIAGNOSTIC_DEFINITIONS (Windows) - Pass to add_definitions() to have diagnostic information about Boost's automatic linking @@ -1371,6 +1372,7 @@ if(Boost_INCLUDE_DIR) math(EXPR Boost_MAJOR_VERSION "${Boost_VERSION} / 100000") math(EXPR Boost_MINOR_VERSION "${Boost_VERSION} / 100 % 1000") math(EXPR Boost_SUBMINOR_VERSION "${Boost_VERSION} % 100") + set(Boost_VERSION_STRING "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}") string(APPEND Boost_ERROR_REASON "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}") |