diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-05 13:04:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-05 13:05:18 (GMT) |
| commit | 2013c30c7bd5a2b625f9487019dfa69e6549461a (patch) | |
| tree | 819c064ee7900e6102991bd7e99f4ba46d8758d3 | |
| parent | 5ef074f726947ecb82b34bffdfa77a167f3425a1 (diff) | |
| parent | a1e04be913078e2733cde350550665a1dc328dcd (diff) | |
| download | CMake-2013c30c7bd5a2b625f9487019dfa69e6549461a.zip CMake-2013c30c7bd5a2b625f9487019dfa69e6549461a.tar.gz CMake-2013c30c7bd5a2b625f9487019dfa69e6549461a.tar.bz2 | |
Merge topic 'FindBoost-1.73' into release-3.17
a1e04be913 FindBoost: Update MinGW compiler tag for Boost 1.73
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Boris Basic <baljci@hotmail.com>
Merge-request: !4706
| -rw-r--r-- | Modules/FindBoost.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index cd7e1c1..1e815a0 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -750,7 +750,11 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret) set(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34 else() _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION _boost_COMPILER_VERSION_MAJOR _boost_COMPILER_VERSION_MINOR) - set(_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}") + if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.73 AND _boost_COMPILER_VERSION_MAJOR VERSION_GREATER_EQUAL 5) + set(_boost_COMPILER "-mgw${_boost_COMPILER_VERSION_MAJOR}") + else() + set(_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}") + endif() endif() elseif (UNIX) _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION _boost_COMPILER_VERSION_MAJOR _boost_COMPILER_VERSION_MINOR) |