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 ed08c7e69a4a1e896331a0588a4a1d3bd413e97b (commit)
via fdfc57059b0e66f30a5df6efa2755706a794cba3 (commit)
from 76c03ce95e9ed57c7693c65e56d0bd61b8baa129 (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=ed08c7e69a4a1e896331a0588a4a1d3bd413e97b
commit ed08c7e69a4a1e896331a0588a4a1d3bd413e97b
Merge: 76c03ce fdfc570
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Apr 16 08:35:04 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Apr 16 08:35:04 2014 -0400
Merge topic 'feature-absence-hard-error' into next
fdfc5705 Defer feature test until using the just-built cmake.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdfc57059b0e66f30a5df6efa2755706a794cba3
commit fdfc57059b0e66f30a5df6efa2755706a794cba3
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Apr 16 14:19:05 2014 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Apr 16 14:32:23 2014 +0200
Defer feature test until using the just-built cmake.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index b468c2e..e797a73 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -53,9 +53,6 @@ add_RunCMake_test(ObjectLibrary)
add_RunCMake_test(TargetObjects)
add_RunCMake_test(TargetSources)
add_RunCMake_test(find_dependency)
-if (NOT CMAKE_CXX_COMPILE_FEATURES)
- set(CompileFeatures_ARGS -DRUN_NOSUPPORTEDCXXFEATURES_TEST=1)
-endif()
add_RunCMake_test(CompileFeatures)
if(NOT WIN32)
add_RunCMake_test(PositionIndependentCode)
@@ -129,9 +126,7 @@ add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
-if (CMAKE_CXX_COMPILE_FEATURES)
- add_RunCMake_test(target_compile_features)
-endif()
+add_RunCMake_test(target_compile_features)
add_RunCMake_test(CheckModules)
add_RunCMake_test(CommandLine)
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index adea989..43d4cb3 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -8,7 +8,13 @@ run_cmake(NotAFeature_OriginDebugGenex)
run_cmake(NotAFeature_OriginDebugTransitive)
run_cmake(NotAFeature_OriginDebug_target_compile_features)
-if (RUN_NOSUPPORTEDCXXFEATURES_TEST)
+run_cmake(generate_feature_list)
+file(READ
+ "${RunCMake_BINARY_DIR}/generate_feature_list-build/features.txt"
+ FEATURES
+)
+
+if (NOT FEATURES)
run_cmake(NoSupportedCxxFeatures)
run_cmake(NoSupportedCxxFeaturesGenex)
endif()
diff --git a/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
b/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
new file mode 100644
index 0000000..2bbbd17
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
@@ -0,0 +1,4 @@
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/features.txt"
+ "${CMAKE_CXX_COMPILE_FEATURES}"
+)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMakeLists.txt | 7 +------
Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 8 +++++++-
Tests/RunCMake/CompileFeatures/generate_feature_list.cmake | 4 ++++
3 files changed, 12 insertions(+), 7 deletions(-)
create mode 100644 Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
