diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-30 12:04:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-30 12:04:07 (GMT) |
| commit | 221fd892512036232c3a606df4770bdd3ae13375 (patch) | |
| tree | 343f0ab5ffca79bf5bebfbf2a73332a3003247a0 /Tests | |
| parent | e9f667c3b02711e295d41a6a328d002aa2122c09 (diff) | |
| parent | e5f5eeca2f632608cf4709cffef9d82f6f5be6f3 (diff) | |
| download | CMake-221fd892512036232c3a606df4770bdd3ae13375.zip CMake-221fd892512036232c3a606df4770bdd3ae13375.tar.gz CMake-221fd892512036232c3a606df4770bdd3ae13375.tar.bz2 | |
Merge topic 'file-CONFIGURE-subdir' into release-3.18
e5f5eeca2f file: Fix CONFIGURE output relative path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4951
Diffstat (limited to 'Tests')
4 files changed, 7 insertions, 0 deletions
diff --git a/Tests/RunCMake/File_Configure/RunCMakeTest.cmake b/Tests/RunCMake/File_Configure/RunCMakeTest.cmake index d09d648..0337014 100644 --- a/Tests/RunCMake/File_Configure/RunCMakeTest.cmake +++ b/Tests/RunCMake/File_Configure/RunCMakeTest.cmake @@ -7,3 +7,4 @@ run_cmake(DirOutput) run_cmake(NewLineStyle-NoArg) run_cmake(NewLineStyle-ValidArg) run_cmake(NewLineStyle-WrongArg) +run_cmake(SubDir) diff --git a/Tests/RunCMake/File_Configure/SubDir-check.cmake b/Tests/RunCMake/File_Configure/SubDir-check.cmake new file mode 100644 index 0000000..1e82587 --- /dev/null +++ b/Tests/RunCMake/File_Configure/SubDir-check.cmake @@ -0,0 +1,4 @@ +set(expected "${RunCMake_TEST_BINARY_DIR}/SubDir/out.txt") +if(NOT EXISTS "${expected}") + set(RunCMake_TEST_FAILED "Expected file not created:\n ${expected}") +endif() diff --git a/Tests/RunCMake/File_Configure/SubDir.cmake b/Tests/RunCMake/File_Configure/SubDir.cmake new file mode 100644 index 0000000..fae60fa --- /dev/null +++ b/Tests/RunCMake/File_Configure/SubDir.cmake @@ -0,0 +1 @@ +add_subdirectory(SubDir) diff --git a/Tests/RunCMake/File_Configure/SubDir/CMakeLists.txt b/Tests/RunCMake/File_Configure/SubDir/CMakeLists.txt new file mode 100644 index 0000000..6bd962e --- /dev/null +++ b/Tests/RunCMake/File_Configure/SubDir/CMakeLists.txt @@ -0,0 +1 @@ +file(CONFIGURE OUTPUT out.txt CONTENT "") |