[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5912-g2206f3d

[Stephen Kelly]

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  2206f3d4140cfe972317f06a03b6bab055a5ee30 (commit)
       via  fd171fbc926f8943dee010e162350c1b73fe718b (commit)
       via  ec168305f5cd40501432444f258f75d8b71effc3 (commit)
      from  f187ec0eed864f4d049ab3e5a44a9b4f133a8455 (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=2206f3d4140cfe972317f06a03b6bab055a5ee30
commit 2206f3d4140cfe972317f06a03b6bab055a5ee30
Merge: f187ec0 fd171fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 28 13:14:09 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 28 13:14:09 2013 -0500

    Merge topic 'target_compile_features' into next
    
    fd171fb Various MSVC fixes.
    ec16830 Fix define check.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd171fbc926f8943dee010e162350c1b73fe718b
commit fd171fbc926f8943dee010e162350c1b73fe718b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 28 19:13:40 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 28 19:13:40 2013 +0100

    Various MSVC fixes.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index b26c3a9..1f86232 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2460,7 +2460,8 @@ const char* cmMakefile::GetDefinition(const char* name) const
 #define PP_FEATURE_NAME(F) \
   if (strcmp(name, "CMAKE_PP_NAME_" #F) == 0) \
     { \
-    return ("COMPILER_" + cmSystemTools::UpperCase(#F)).c_str(); \
+    static std::string val = ("COMPILER_" + cmSystemTools::UpperCase(#F)); \
+    return val.c_str(); \
     }
   FOR_EACH_CXX_FEATURE(PP_FEATURE_NAME)
 #undef PP_FEATURE_NAME
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3c8c116..2b8b504 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -414,7 +414,7 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader)
   if ((CMAKE_CXX_COMPILER_ID STREQUAL GNU AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
       OR CMAKE_CXX_COMPILER_ID STREQUAL Clang
-      OR (CMAKE_CXX_COMPILER_ID STREQUAL MSVC AND NOT MSVC_VERSION VERSION_LESS 1400))
+      OR (x${CMAKE_CXX_COMPILER_ID} STREQUAL xMSVC AND NOT MSVC_VERSION VERSION_LESS 1400))
     ADD_TEST_MACRO(Module.WriteCompilerDetectionHeader WriteCompilerDetectionHeader)
   endif()
 
@@ -2211,7 +2211,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
 
   if ((CMAKE_CXX_COMPILER_ID STREQUAL GNU AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
       OR CMAKE_CXX_COMPILER_ID STREQUAL Clang
-      OR (CMAKE_CXX_COMPILER_ID STREQUAL MSVC AND NOT MSVC_VERSION VERSION_LESS 1400))
+      OR (x${CMAKE_CXX_COMPILER_ID} STREQUAL xMSVC AND NOT MSVC_VERSION VERSION_LESS 1400))
     ADD_TEST_MACRO(CMakeCommands.target_compile_features target_compile_features)
   endif()
   ADD_TEST_MACRO(compile_features compile_features)
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 3de0cd8..d040eae 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -48,6 +48,10 @@ add_executable(WriteCompilerDetectionHeader main.cpp)
 set_property(TARGET WriteCompilerDetectionHeader PROPERTY CXX_STANDARD 98)
 set_defines(WriteCompilerDetectionHeader "${true_defs}" "${false_defs}")
 
+if(MSVC)
+  return() # MSVC has only one mode.
+endif()
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
     OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
   list(APPEND true_defs EXPECTED_COMPILER_GNUXX_TYPEOF)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec168305f5cd40501432444f258f75d8b71effc3
commit ec168305f5cd40501432444f258f75d8b71effc3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 28 19:07:29 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 28 19:09:39 2013 +0100

    Fix define check.

diff --git a/Tests/Module/WriteCompilerDetectionHeader/main.cpp b/Tests/Module/WriteCompilerDetectionHeader/main.cpp
index 7b91203..cccd19d 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/main.cpp
+++ b/Tests/Module/WriteCompilerDetectionHeader/main.cpp
@@ -3,10 +3,7 @@
 
 #define JOIN_IMPL(A, B) A ## B
 #define JOIN(A, B) JOIN_IMPL(A, B)
-#define CHECK(FEATURE) (defined(TEST_COMPILER_ ## FEATURE) \
-    && defined(EXPECTED_COMPILER_ ## FEATURE) \
-    && JOIN(TEST_COMPILER_, FEATURE) == JOIN(EXPECTED_COMPILER_, FEATURE) \
-  )
+#define CHECK(FEATURE) (JOIN(TEST_COMPILER_, FEATURE) == JOIN(EXPECTED_COMPILER_, FEATURE))
 
 #if !CHECK(CXX_BINARY_LITERALS)
 #error cxx_binary_literals expected availability did not match.

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

Summary of changes:
 Source/cmMakefile.cxx                              |    3 ++-
 Tests/CMakeLists.txt                               |    4 ++--
 .../WriteCompilerDetectionHeader/CMakeLists.txt    |    4 ++++
 Tests/Module/WriteCompilerDetectionHeader/main.cpp |    5 +----
 4 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake