[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2400-gc46d249

[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  c46d2494d660fe7f5248debb99993c4bc07412f3 (commit)
       via  10f5f6f777738d18a46dd82ba787fb2dbdd4282c (commit)
      from  f25b66f11a0498939ee140fad5b3bc389c27d996 (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=c46d2494d660fe7f5248debb99993c4bc07412f3
commit c46d2494d660fe7f5248debb99993c4bc07412f3
Merge: f25b66f 10f5f6f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 16 10:17:29 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 16 10:17:29 2014 -0400

    Merge topic 'feature-absence-hard-error' into next
    
    10f5f6f7 Defer feature test until using the just-built cmake.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10f5f6f777738d18a46dd82ba787fb2dbdd4282c
commit 10f5f6f777738d18a46dd82ba787fb2dbdd4282c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 16 16:14:26 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 16 16:14:26 2014 +0200

    Defer feature test until using the just-built cmake.

diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
index ad76411..f03f33d 100644
--- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
@@ -1,6 +1,14 @@
 cmake_minimum_required(VERSION 3.0)
 project(target_compile_features)
 
+if (NOT CMAKE_CXX_COMPILE_FEATURES)
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp"
+    "int main(int,char**) { return 0; }\n"
+  )
+  add_executable(target_compile_features "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
+  return()
+endif()
+
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
 add_executable(target_compile_features main.cpp)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 53fa427..9d642cc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -197,10 +197,9 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(TarTest TarTest)
   ADD_TEST_MACRO(SystemInformation SystemInformation)
   ADD_TEST_MACRO(MathTest MathTest)
-  if(CMAKE_CXX_COMPILE_FEATURES)
-    ADD_TEST_MACRO(CompileFeatures CompileFeatures)
-    ADD_TEST_MACRO(CMakeCommands.target_compile_features target_compile_features)
-  endif()
+  ADD_TEST_MACRO(CompileFeatures CompileFeatures)
+  ADD_TEST_MACRO(CMakeCommands.target_compile_features target_compile_features)
+
   # assume no resources building to test
   set(TEST_RESOURCES FALSE)
   # for windows and cygwin assume we have resources
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index bceb6bb..ce5004b 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -3,6 +3,14 @@ cmake_minimum_required(VERSION 3.0)
 
 project(CompileFeatures)
 
+if (NOT CMAKE_CXX_COMPILE_FEATURES)
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp"
+    "int main(int,char**) { return 0; }\n"
+  )
+  add_executable(CompileFeatures "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp")
+  return()
+endif()
+
 macro(run_test feature)
   if (";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ${feature})
     add_library(test_${feature} OBJECT ${feature}.cpp)

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

Summary of changes:
 Tests/CMakeCommands/target_compile_features/CMakeLists.txt |    8 ++++++++
 Tests/CMakeLists.txt                                       |    7 +++----
 Tests/CompileFeatures/CMakeLists.txt                       |    8 ++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake