diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-04 14:13:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-10-04 17:39:22 (GMT) |
| commit | 3d8356d486ae736d1ba151aedfeb928222e7a084 (patch) | |
| tree | ca7a5aefdaac1f61bb04c96a11095642d5f7dbc3 /Modules/CMakeFindBinUtils.cmake | |
| parent | 51ab85c398319c074200ca51f37baa0e4c47ed7c (diff) | |
| download | CMake-3d8356d486ae736d1ba151aedfeb928222e7a084.zip CMake-3d8356d486ae736d1ba151aedfeb928222e7a084.tar.gz CMake-3d8356d486ae736d1ba151aedfeb928222e7a084.tar.bz2 | |
Clang: Support Windows variants for GNU and MSVC (#13035, #14458)
Teach the compiler identification preprocessor tests to report when
Clang simulates MSVC, and what version. If not MSVC, assume GNU.
Teach compiler information modules Clang-(C|CXX) to recognize when Clang
simulates MSVC and skip loading the GNU information.
Teach the Windows-MSVC platform information to recognize when it is
loaded as the simulated compiler and use that version information
instead of the real compiler's (different) version scheme.
Add platform modules Windows-Clang-(C|CXX) and support module
Windows-Clang to load either Windows-MSVC or Windows-GNU and wrap
the corresponding information macros.
Diffstat (limited to 'Modules/CMakeFindBinUtils.cmake')
| -rw-r--r-- | Modules/CMakeFindBinUtils.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index e70c013..b4e2ae5 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -30,8 +30,10 @@ # License text for the above reference.) # if it's the MS C/CXX compiler, search for link -if("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC" - OR "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC" +if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC" + OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC" + OR "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC" + OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_GENERATOR}" MATCHES "Visual Studio") find_program(CMAKE_LINKER NAMES link HINTS ${_CMAKE_TOOLCHAIN_LOCATION}) |