[Cmake-commits] CMake branch, next, updated. v3.0.2-2089-g6254fc8

Ben Boeckel ben.boeckel at kitware.com
Mon Oct 20 11:49:14 EDT 2014


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  6254fc83ee80504d2c058a2a70198b587e0c3d88 (commit)
       via  ed766d6ad2b3eeff6493d420297a3c35b07c71ef (commit)
      from  01a4ca49b8a42da249d1b1eb64dad4d27a85fd2d (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=6254fc83ee80504d2c058a2a70198b587e0c3d88
commit 6254fc83ee80504d2c058a2a70198b587e0c3d88
Merge: 01a4ca4 ed766d6
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Oct 20 11:49:13 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 20 11:49:13 2014 -0400

    Merge topic 'cmake-cmp0054-warnings' into next
    
    ed766d6a fixup! Avoid if() quoted auto-dereference


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed766d6ad2b3eeff6493d420297a3c35b07c71ef
commit ed766d6ad2b3eeff6493d420297a3c35b07c71ef
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Oct 20 11:49:06 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Oct 20 11:49:06 2014 -0400

    fixup! Avoid if() quoted auto-dereference

diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake
index 3d5c113..4bc42dd 100644
--- a/Modules/CMakeDetermineCompilerABI.cmake
+++ b/Modules/CMakeDetermineCompilerABI.cmake
@@ -28,7 +28,7 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
     if(DEFINED CMAKE_${lang}_VERBOSE_FLAG)
       set(CMAKE_FLAGS "-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_${lang}_VERBOSE_FLAG}")
     endif()
-    if(NOT CMAKE_${lang}_COMPILER_ID STREQUAL "MSVC")
+    if(NOT "x${CMAKE_${lang}_COMPILER_ID}" STREQUAL "xMSVC")
       # Avoid adding our own platform standard libraries for compilers
       # from which we might detect implicit link libraries.
       list(APPEND CMAKE_FLAGS "-DCMAKE_${lang}_STANDARD_LIBRARIES=")

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

Summary of changes:
 Modules/CMakeDetermineCompilerABI.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list