diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-20 13:53:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-20 13:53:47 (GMT) |
| commit | b1e7fe9e8d35f86ea0af4292bb9a46578fcdc689 (patch) | |
| tree | c437300065207b7f753a0d05f7c9a3bc1522a611 /Modules/Compiler | |
| parent | 5ee198d76e1b33a596d6bca18bbed5ec363ca322 (diff) | |
| parent | 543c4304bb48149ed2f642f88070829a30266ec0 (diff) | |
| download | CMake-b1e7fe9e8d35f86ea0af4292bb9a46578fcdc689.zip CMake-b1e7fe9e8d35f86ea0af4292bb9a46578fcdc689.tar.gz CMake-b1e7fe9e8d35f86ea0af4292bb9a46578fcdc689.tar.bz2 | |
Merge branch 'backport-fix-CMP0054-MSVC' into release
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/AppleClang-CXX.cmake | 2 | ||||
| -rw-r--r-- | Modules/Compiler/Clang-CXX.cmake | 2 | ||||
| -rw-r--r-- | Modules/Compiler/Clang.cmake | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake index 0372e18..c1acae6 100644 --- a/Modules/Compiler/AppleClang-CXX.cmake +++ b/Modules/Compiler/AppleClang-CXX.cmake @@ -1,6 +1,6 @@ include(Compiler/Clang) __compiler_clang(CXX) -if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") +if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") endif() diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake index 5dd7b4a..9ef1413 100644 --- a/Modules/Compiler/Clang-CXX.cmake +++ b/Modules/Compiler/Clang-CXX.cmake @@ -1,7 +1,7 @@ include(Compiler/Clang) __compiler_clang(CXX) -if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") +if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden") endif() diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake index eeba119..701089c 100644 --- a/Modules/Compiler/Clang.cmake +++ b/Modules/Compiler/Clang.cmake @@ -18,8 +18,8 @@ if(__COMPILER_CLANG) endif() set(__COMPILER_CLANG 1) -if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC" - OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") +if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC" + OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") macro(__compiler_clang lang) endmacro() else() |