diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-12 13:31:06 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-12 13:31:06 (GMT) |
| commit | f20bb8f00371e932a481f5a84e3418cb47cdb041 (patch) | |
| tree | 7e08f5c4f6c687c3f9ecc43c589bd38ec9b1031b /Tests/RunCMake | |
| parent | 68f6460f66554343afa5e05c1913b17323bdafbe (diff) | |
| parent | bc9a8bba4660e9216f87323006d936bf6d43f799 (diff) | |
| download | CMake-f20bb8f00371e932a481f5a84e3418cb47cdb041.zip CMake-f20bb8f00371e932a481f5a84e3418cb47cdb041.tar.gz CMake-f20bb8f00371e932a481f5a84e3418cb47cdb041.tar.bz2 | |
Merge topic 'minor-cleanups'
bc9a8bba Makefile: Undef FEATURE_STRING iteration define after use.
eb638c75 Tests: Make CompileFeatures feature list lang-specific.
e2f09aff CMakeConfigurableFile: Remove excess newline.
5109b042 Features: Fix GNU 4.8.1 version test.
6a9fdbeb Test: Parameterize the language in the CompileFeature test.
f5bf9d43 Tests: Make CompileFeature tests use highest standard known.
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/generate_feature_list.cmake | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake index f083751..bb4e0f9 100644 --- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake +++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake @@ -10,11 +10,11 @@ run_cmake(NotAFeature_OriginDebug_target_compile_features) run_cmake(generate_feature_list) file(READ - "${RunCMake_BINARY_DIR}/generate_feature_list-build/features.txt" - FEATURES + "${RunCMake_BINARY_DIR}/generate_feature_list-build/cxx_features.txt" + CXX_FEATURES ) -if (NOT FEATURES) +if (NOT CXX_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 index 06c4f73..beb15fc 100644 --- a/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake +++ b/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake @@ -1,5 +1,5 @@ -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/features.txt" +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cxx_features.txt" "${CMAKE_CXX_COMPILE_FEATURES}" ) |