[Cmake-commits] CMake branch, next, updated. v3.3.1-2276-g24c0631

Brad King brad.king at kitware.com
Thu Aug 20 09:29:45 EDT 2015


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  24c06319347e706c83422af382a72a9f82b47eff (commit)
       via  5abe76d8bfafd0935d897c5f22e1485eef0c6904 (commit)
      from  6a9aa5b378422f8d0d89b53e181c4bec2104f082 (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=24c06319347e706c83422af382a72a9f82b47eff
commit 24c06319347e706c83422af382a72a9f82b47eff
Merge: 6a9aa5b 5abe76d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 20 09:29:44 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 20 09:29:44 2015 -0400

    Merge topic 'MSVC-quote-for-release' into next
    
    5abe76d8 Revert "CMake: Silence CMP0054 warning with separate project, enable_language calls."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5abe76d8bfafd0935d897c5f22e1485eef0c6904
commit 5abe76d8bfafd0935d897c5f22e1485eef0c6904
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Wed Aug 19 22:40:14 2015 -0400
Commit:     Matt McCormick <matt.mccormick at kitware.com>
CommitDate: Wed Aug 19 22:40:14 2015 -0400

    Revert "CMake: Silence CMP0054 warning with separate project, enable_language calls."
    
    This reverts commit 306c9361ce1fffc85b2ffe88132885cf5955f1ba.

diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake
index 7e6d8dc..893c454 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -103,17 +103,14 @@ if(NOT CMAKE_CXX_COMPILER_ID_RUN)
   CMAKE_DETERMINE_COMPILER_ID(CXX CXXFLAGS CMakeCXXCompilerId.cpp)
 
   # Set old compiler and platform id variables.
-  cmake_policy(PUSH)
-    cmake_policy(SET CMP0054 NEW)
-    if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-      set(CMAKE_COMPILER_IS_GNUCXX 1)
-    endif()
-    if("${CMAKE_CXX_PLATFORM_ID}" MATCHES "MinGW")
-      set(CMAKE_COMPILER_IS_MINGW 1)
-    elseif("${CMAKE_CXX_PLATFORM_ID}" MATCHES "Cygwin")
-      set(CMAKE_COMPILER_IS_CYGWIN 1)
-    endif()
-  cmake_policy(POP)
+  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+    set(CMAKE_COMPILER_IS_GNUCXX 1)
+  endif()
+  if("${CMAKE_CXX_PLATFORM_ID}" MATCHES "MinGW")
+    set(CMAKE_COMPILER_IS_MINGW 1)
+  elseif("${CMAKE_CXX_PLATFORM_ID}" MATCHES "Cygwin")
+    set(CMAKE_COMPILER_IS_CYGWIN 1)
+  endif()
 endif()
 
 if (NOT _CMAKE_TOOLCHAIN_LOCATION)

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

Summary of changes:
 Modules/CMakeDetermineCXXCompiler.cmake |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list