reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-23 03:29:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'FindBoost-1.73'

Browse Source 
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
This commit is contained in:
Brad King 2020-05-05 13:04:05 +00:00 committed by Kitware Robot
commit e99e5418b4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindBoost.cmake
View File

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