[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-746-g82cfc64

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  82cfc649ad24111fa433813886992ddd807af638 (commit)
       via  4d52cd36ada014bc3e9a65be06b30966cf29f9a8 (commit)
       via  f7b6f3d967b9bebc720ba981bb0f4d8b706bc74c (commit)
      from  4348fa359a3981c2c5962f14a650ec2eb89421d5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82cfc649ad24111fa433813886992ddd807af638
commit 82cfc649ad24111fa433813886992ddd807af638
Merge: 4348fa3 4d52cd3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 19 16:25:14 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 19 16:25:14 2014 -0500

    Merge topic 'fix-CMP0054-MSVC' into next
    
    4d52cd36 Avoid if() quoted auto-dereference when checking for "MSVC"
    f7b6f3d9 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d52cd36ada014bc3e9a65be06b30966cf29f9a8
commit 4d52cd36ada014bc3e9a65be06b30966cf29f9a8
Author:     Fraser Hutchison <fraser.hutchison at maidsafe.net>
AuthorDate: Wed Nov 19 09:21:27 2014 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 19 16:24:54 2014 -0500

    Avoid if() quoted auto-dereference when checking for "MSVC"
    
    When testing CMAKE_<LANG>_COMPILER_ID values against "MSVC", do not
    allow the definition of the "MSVC" variable to be expanded.

diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 50cb972..376a6dc 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("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
+   OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC"
+   OR "x${CMAKE_Fortran_SIMULATE_ID}" STREQUAL "xMSVC"
+   OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC"
+   OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC"
    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..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 780a072..6fe0b56 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()
diff --git a/Modules/Platform/Windows-Clang.cmake b/Modules/Platform/Windows-Clang.cmake
index 4c936fe..da19a3d 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("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
+    OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
   include(Platform/Windows-MSVC)
   macro(__windows_compiler_clang lang)
     __windows_compiler_msvc(${lang})

-----------------------------------------------------------------------

Summary of changes:
 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 ++--
 Source/CMakeVersion.cmake             |    2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake