diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-15 14:53:47 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-15 14:53:47 (GMT) |
| commit | 101a62aacbcc812263439ca42faaf4f2419b6119 (patch) | |
| tree | edde32775335da2b100dc24fff5c4698d261e3c9 /Tests/RunCMake | |
| parent | 23c02d245425ab15d6d0a99941355488ddee8cf5 (diff) | |
| parent | 4ce110bbbac36362d8f3fbddb0b405320695ed36 (diff) | |
| download | CMake-101a62aacbcc812263439ca42faaf4f2419b6119.zip CMake-101a62aacbcc812263439ca42faaf4f2419b6119.tar.gz CMake-101a62aacbcc812263439ca42faaf4f2419b6119.tar.bz2 | |
Merge topic 'revert-feature_record_msvc'
4ce110bb Tests: Revert workaround for COMPILE_FEATURES genex bug
0b7e7e27 Revert topic 'feature_record_msvc'
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake index 4de8e88..b544b99 100644 --- a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake +++ b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake @@ -11,7 +11,7 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file${expected_res COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp" "${CMAKE_CURRENT_BINARY_DIR}/copied_file${genexvar}.cpp" ) -add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file${expected_result}.cpp") +add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file${genexvar}.cpp") if (HAVE_FINAL) target_compile_features(empty PRIVATE cxx_final) endif() diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake index 3b37091..1892a5c 100644 --- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake +++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake @@ -27,13 +27,8 @@ if (NOT CXX_FEATURES) run_cmake(NoSupportedCxxFeatures) run_cmake(NoSupportedCxxFeaturesGenex) else() - # compilers such as MSVC have no explicit flags to enable c++11 mode. - # Instead they come with all c++11 features implicitly enabled. - # So for those types of compilers this tests is not applicable. - if(CMAKE_CXX11_STANDARD_COMPILE_OPTION) - run_cmake(LinkImplementationFeatureCycle) - run_cmake(LinkImplementationFeatureCycleSolved) - endif() + run_cmake(LinkImplementationFeatureCycle) + run_cmake(LinkImplementationFeatureCycleSolved) if (";${CXX_FEATURES};" MATCHES ";cxx_final;") set(RunCMake_TEST_OPTIONS "-DHAVE_FINAL=1") |