diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-05-10 11:05:46 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-05-10 11:05:46 (GMT) |
| commit | eb638c75cc43be338391f9a12f23570e7dfcd48d (patch) | |
| tree | 94257ffcf26a9b80ca11fd026e3024efd314af0e | |
| parent | e2f09aff12fe0188c032f814aeb5f8f8bd577246 (diff) | |
| download | CMake-eb638c75cc43be338391f9a12f23570e7dfcd48d.zip CMake-eb638c75cc43be338391f9a12f23570e7dfcd48d.tar.gz CMake-eb638c75cc43be338391f9a12f23570e7dfcd48d.tar.bz2 | |
Tests: Make CompileFeatures feature list lang-specific.
| -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}" ) |