[cmake-developers] Patch for new warning caused by CMP0054
Fraser Hutchison
fraser.hutchison at gmail.com
Tue Nov 18 18:18:20 EST 2014
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/cmake-developers/attachments/20141118/9d5316b8/attachment.html>
-------------- next part --------------
From 9c0cd531876c60ad12e5df443bc3026a97a04404 Mon Sep 17 00:00:00 2001
From: Fraser Hutchison <fraser.hutchison at maidsafe.net>
Date: Tue, 18 Nov 2014 22:55:52 +0000
Subject: [PATCH] Removed quoted instances of MSVC to avoid generating warnings
via CMP0054.
---
Modules/CMakeFindBinUtils.cmake | 10 +++++-----
Modules/Compiler/AppleClang-CXX.cmake | 2 +-
Modules/Compiler/Clang-CXX.cmake | 2 +-
Modules/Compiler/Clang.cmake | 4 ++--
Modules/Platform/Windows-Clang.cmake | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 50cb972..d2991d2 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -30,11 +30,11 @@
# License text for the above reference.)
# if it's the MS C/CXX compiler, search for link
-if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC"
- OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC"
- OR CMAKE_Fortran_SIMULATE_ID STREQUAL "MSVC"
- OR CMAKE_C_COMPILER_ID STREQUAL "MSVC"
- OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC"
+if(CMAKE_C_SIMULATE_ID STREQUAL MSVC
+ OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC
+ OR CMAKE_Fortran_SIMULATE_ID STREQUAL MSVC
+ OR CMAKE_C_COMPILER_ID STREQUAL MSVC
+ OR CMAKE_CXX_COMPILER_ID STREQUAL MSVC
OR (CMAKE_GENERATOR MATCHES "Visual Studio"
AND NOT CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android"))
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 0372e18..0cabca4 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 CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)
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 780a072..bc88405 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 CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)
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..b964fce 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(CMAKE_C_SIMULATE_ID STREQUAL MSVC
+ OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)
macro(__compiler_clang lang)
endmacro()
else()
diff --git a/Modules/Platform/Windows-Clang.cmake b/Modules/Platform/Windows-Clang.cmake
index 4c936fe..d37b969 100644
--- a/Modules/Platform/Windows-Clang.cmake
+++ b/Modules/Platform/Windows-Clang.cmake
@@ -18,8 +18,8 @@ if(__WINDOWS_CLANG)
endif()
set(__WINDOWS_CLANG 1)
-if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC"
- OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
+if(CMAKE_C_SIMULATE_ID STREQUAL MSVC
+ OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)
include(Platform/Windows-MSVC)
macro(__windows_compiler_clang lang)
__windows_compiler_msvc(${lang})
--
1.9.4.msysgit.1
More information about the cmake-developers
mailing list