mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-01 19:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindBoost: Update MinGW compiler tag for Boost 1.73

Browse Source 
Boost 1.73 on MinGW no longer uses the compiler minor version in
its library names if the major version is at least 5.

Fixes: #20673
This commit is contained in:
Brad King
2020-05-04 10:49:18 -04:00
parent 615129f3eb
commit a1e04be913
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindBoost.cmake
View File

@@ -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)