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 | e99e5418b4a29352877e223411c6c12be15b7394 (patch) | |
| tree | 037a31de4d8814d0e076702dc3b6f2ec47bd4fc9 /Modules/FindBoost.cmake | |
| parent | 62fed74d4caf27df674c06c5473f3879f227c7e1 (diff) | |
| parent | a1e04be913078e2733cde350550665a1dc328dcd (diff) | |
| download | CMake-e99e5418b4a29352877e223411c6c12be15b7394.zip CMake-e99e5418b4a29352877e223411c6c12be15b7394.tar.gz CMake-e99e5418b4a29352877e223411c6c12be15b7394.tar.bz2 | |
Merge topic 'FindBoost-1.73'
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
Diffstat (limited to 'Modules/FindBoost.cmake')
| -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 3772640..13981d3 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -754,7 +754,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) |