diff options
| author | Artur Ryt <artur.ryt@gmail.com> | 2018-11-30 23:51:05 +0100 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-12-12 08:29:14 -0500 |
| commit | fe9a16c80fe921d2db66c0699b4197f85a281e7e (patch) | |
| tree | 62b490a9996ed70715817bcaa76442f3abd4eaa6 /Tests/CMakeTests | |
| parent | dda4755b467db297b04cc1678e0d7c6035ad4c2f (diff) | |
| download | cmake-fe9a16c80fe921d2db66c0699b4197f85a281e7e.tar.gz | |
cmMakefile: Fix @CMAKE_CURRENT_LIST_LINE@ for ExpandVariablesInStringNew
Added check for variable name in @@ evaluation and test for
configuring @CMAKE_CURRENT_LIST_LINE@ with new CMP0053
Fixes: #18646
Diffstat (limited to 'Tests/CMakeTests')
| -rw-r--r-- | Tests/CMakeTests/StringTest.cmake.in | 2 | ||||
| -rw-r--r-- | Tests/CMakeTests/StringTestScript.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in index 3e9327bf63..154afa7f83 100644 --- a/Tests/CMakeTests/StringTest.cmake.in +++ b/Tests/CMakeTests/StringTest.cmake.in @@ -81,7 +81,7 @@ check_cmake_test(String # Execute each test listed in StringTestScript.cmake: # set(scriptname "@CMAKE_CURRENT_SOURCE_DIR@/StringTestScript.cmake") -set(number_of_tests_expected 73) +set(number_of_tests_expected 74) include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake") execute_all_script_tests(${scriptname} number_of_tests_executed) diff --git a/Tests/CMakeTests/StringTestScript.cmake b/Tests/CMakeTests/StringTestScript.cmake index d8f31ddbf6..e069897b6b 100644 --- a/Tests/CMakeTests/StringTestScript.cmake +++ b/Tests/CMakeTests/StringTestScript.cmake @@ -54,6 +54,9 @@ elseif(testname STREQUAL configure_line_number_CMP0053_new) # pass elseif(testname STREQUAL configure_line_number_CMP0053_old_use_at) # pass test_configure_line_number("\@CMAKE_CURRENT_LIST_LINE\@" OLD) +elseif(testname STREQUAL configure_line_number_CMP0053_new_use_at) # pass + test_configure_line_number("\@CMAKE_CURRENT_LIST_LINE\@" NEW) + elseif(testname STREQUAL configure_bogus) # fail string(CONFIGURE "this is @testname@" v ESCAPE_QUOTES BOGUS) |