diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-14 18:41:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-14 18:41:45 (GMT) |
| commit | 4ce110bbbac36362d8f3fbddb0b405320695ed36 (patch) | |
| tree | ce3b650f7e764b9bd04311c59b6ac75b4aba01d3 /Tests/RunCMake/CompileFeatures | |
| parent | 0b7e7e277c111d274d7dba378273f77d5b2a4fd7 (diff) | |
| download | CMake-4ce110bbbac36362d8f3fbddb0b405320695ed36.zip CMake-4ce110bbbac36362d8f3fbddb0b405320695ed36.tar.gz CMake-4ce110bbbac36362d8f3fbddb0b405320695ed36.tar.bz2 | |
Tests: Revert workaround for COMPILE_FEATURES genex bug
The second hunk of commit 07d1f6fc (Features: Properly evaluate if the
compiler supports cxx_final, 2014-12-31) was a workaround for a bug in
the COMPILE_FEATURES generator expression that caused it never to return
0. Revert the workaround so we can fix the bug instead.
Diffstat (limited to 'Tests/RunCMake/CompileFeatures')
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake | 2 |
1 files changed, 1 insertions, 1 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() |