[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1803-g589a434

Rolf Eike Beer eike at sf-mail.de
Thu Apr 3 13:05:23 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  589a4348c8e61ff5e04b0a014b4dc7bf2a22b3ae (commit)
       via  0d12fb54798b67153e309739cc88a9b11b5ab168 (commit)
      from  caf126892efc7599fba4069ac3e442f760a24f99 (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=589a4348c8e61ff5e04b0a014b4dc7bf2a22b3ae
commit 589a4348c8e61ff5e04b0a014b4dc7bf2a22b3ae
Merge: caf1268 0d12fb5
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Apr 3 13:05:22 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 3 13:05:22 2014 -0400

    Merge topic 'hpux-compile' into next
    
    0d12fb54 check for C++ compiler feature support after setting the needed flags


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d12fb54798b67153e309739cc88a9b11b5ab168
commit 0d12fb54798b67153e309739cc88a9b11b5ab168
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Apr 3 19:02:01 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Apr 3 19:05:12 2014 +0200

    check for C++ compiler feature support after setting the needed flags

diff --git a/CompileFlags.cmake b/CompileFlags.cmake
index 88c5156..873af8f 100644
--- a/CompileFlags.cmake
+++ b/CompileFlags.cmake
@@ -19,7 +19,6 @@ endif()
 if(CMAKE_GENERATOR MATCHES "Visual Studio 6")
   set(CMAKE_SKIP_COMPATIBILITY_TESTS 1)
 endif()
-include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
 
 if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
   set(_INTEL_WINDOWS 1)
@@ -76,3 +75,5 @@ endif ()
 if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
 endif ()
+
+include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)

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

Summary of changes:
 CompileFlags.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list