diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2014-12-31 15:25:33 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-01-11 15:47:58 (GMT) |
| commit | 07d1f6fca1d6ea21dea64b32639c44d5eecf98a6 (patch) | |
| tree | bc2ed21e5a31861511dbde95501f6f2cb3102259 /Tests | |
| parent | 6296192defaaaa4c18b1821614c20b95ad94f806 (diff) | |
| download | CMake-07d1f6fca1d6ea21dea64b32639c44d5eecf98a6.zip CMake-07d1f6fca1d6ea21dea64b32639c44d5eecf98a6.tar.gz CMake-07d1f6fca1d6ea21dea64b32639c44d5eecf98a6.tar.bz2 | |
Features: Properly evaluate if the compiler supports cxx_final.
Previously we expanded HAVE_FINAL to determine what the copied_file number
would be, but when we don't have cxx_final than HAVE_FINAL is not defined.
What we really want is to use expected_result.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake index c6707c1..4de8e88 100644 --- a/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake +++ b/Tests/RunCMake/CompileFeatures/NonValidTarget1.cmake @@ -7,11 +7,11 @@ else() set(expected_result 0) endif() -add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file${HAVE_FINAL}.cpp" +add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/copied_file${expected_result}.cpp" 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${genexvar}.cpp") +add_library(empty "${CMAKE_CURRENT_BINARY_DIR}/copied_file${expected_result}.cpp") if (HAVE_FINAL) target_compile_features(empty PRIVATE cxx_final) endif() |