[Cmake-commits] CMake branch, next, updated. v3.1.0-2200-g41a41e6

[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  41a41e60fdc05c31ce5fafb5b2242fabc207c4db (commit)
       via  3c0996c135198fbcaf8951cffc98e3a1570e756d (commit)
       via  8dc0c976661ff048c346d6c68666bd7056ed84a5 (commit)
      from  26883b20debd5facab0eb9a2baa08b98a4df1eb0 (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=41a41e60fdc05c31ce5fafb5b2242fabc207c4db
commit 41a41e60fdc05c31ce5fafb5b2242fabc207c4db
Merge: 26883b2 3c0996c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 19 14:04:51 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 19 14:04:51 2015 -0500

    Merge topic 'WriteCompilerDetectionHeader-tests' into next
    
    3c0996c1 WCDH: Test that no C compiler features are defined for CXX compiler.
    8dc0c976 WCDH: Fix the C_STANDARD property in the tests.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c0996c135198fbcaf8951cffc98e3a1570e756d
commit 3c0996c135198fbcaf8951cffc98e3a1570e756d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 19 19:52:22 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jan 19 20:03:23 2015 +0100

    WCDH: Test that no C compiler features are defined for CXX compiler.
    
    This amends commit 54156d72 (WCDH: Generate per-language files
    in multi-file mode., 2015-01-17).

diff --git a/Tests/Module/WriteCompilerDetectionHeader/main.cpp b/Tests/Module/WriteCompilerDetectionHeader/main.cpp
index 82b2191..192094c 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/main.cpp
+++ b/Tests/Module/WriteCompilerDetectionHeader/main.cpp
@@ -4,6 +4,10 @@
 #define PREFIX TEST
 #include "compile_tests.h"
 
+#ifdef TEST_COMPILER_C_STATIC_ASSERT
+#error Expect no C features defined
+#endif
+
 int main()
 {
   return 0;
diff --git a/Tests/Module/WriteCompilerDetectionHeader/multi_files.cpp b/Tests/Module/WriteCompilerDetectionHeader/multi_files.cpp
index ca29823..1635091 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/multi_files.cpp
+++ b/Tests/Module/WriteCompilerDetectionHeader/multi_files.cpp
@@ -4,6 +4,10 @@
 #define PREFIX MULTI
 #include "compile_tests.h"
 
+#ifdef MULTI_COMPILER_C_STATIC_ASSERT
+#error Expect no C features defined
+#endif
+
 int main()
 {
   return 0;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dc0c976661ff048c346d6c68666bd7056ed84a5
commit 8dc0c976661ff048c346d6c68666bd7056ed84a5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 19 19:43:04 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jan 19 19:57:54 2015 +0100

    WCDH: Fix the C_STANDARD property in the tests.
    
    The CXX_STANDARD property validates the values allowed for it,
    and '90' is not a valid value for it.  However, the validation is only
    done for languages enabled for the target, and as C_undefined has no
    CXX files, that language is not enabled for it.
    
    This amends commit v3.1.0-rc3~23^2 (WCDH: Make the header -Wundef
    safe for the C language., 2014-11-24).

diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index b5e46c0..78c4a6a 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -71,7 +71,7 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
     OR CMAKE_C_COMPILER_ID STREQUAL "Clang"
     OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
   add_executable(C_undefined c_undefined.c)
-  set_property(TARGET C_undefined PROPERTY CXX_STANDARD 90)
+  set_property(TARGET C_undefined PROPERTY C_STANDARD 90)
   target_compile_options(C_undefined PRIVATE -Werror=undef)
 endif()
 

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

Summary of changes:
 Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt  |    2 +-
 Tests/Module/WriteCompilerDetectionHeader/main.cpp        |    4 ++++
 Tests/Module/WriteCompilerDetectionHeader/multi_files.cpp |    4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake