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

FindBoost: Consider boost suffixes suitable for clang-cl

Browse Source 
When compiling with `clang-cl` we can use either the MSVC- or
Clang-built boost libraries.
This commit is contained in:
Douman
2019-03-29 22:45:47 +03:00
committed by Brad King
parent 1177464dda
commit d48bf97fd3
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindBoost.cmake
View File

@@ -465,7 +465,7 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
endif() endif()
elseif (GHSMULTI) elseif (GHSMULTI)
set(_boost_COMPILER "-ghs") set(_boost_COMPILER "-ghs")
elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") elseif("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC" OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
if(MSVC_TOOLSET_VERSION GREATER_EQUAL 141) if(MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
set(_boost_COMPILER "-vc141;-vc140") set(_boost_COMPILER "-vc141;-vc140")
elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 80) elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 80)
@@ -477,6 +477,12 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
else() # VS 6.0 Good luck! else() # VS 6.0 Good luck!
set(_boost_COMPILER "-vc6") # yes, this is correct set(_boost_COMPILER "-vc6") # yes, this is correct
endif() endif()
if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang")
string(REPLACE "." ";" VERSION_LIST "${CMAKE_CXX_COMPILER_VERSION}")
list(GET VERSION_LIST 0 CLANG_VERSION_MAJOR)
set(_boost_COMPILER "-clangw${CLANG_VERSION_MAJOR};${_boost_COMPILER}")
endif()
elseif (BORLAND) elseif (BORLAND)
set(_boost_COMPILER "-bcb") set(_boost_COMPILER "-bcb")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")