diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-29 09:18:06 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-06-29 09:20:42 -0400 |
| commit | e5f5eeca2f632608cf4709cffef9d82f6f5be6f3 (patch) | |
| tree | 17a6f581732c79732c82a1b682fb2e34443e692f | |
| parent | e66fe75792a2fbe9f3ffe237c748008906ae7116 (diff) | |
| download | cmake-e5f5eeca2f632608cf4709cffef9d82f6f5be6f3.tar.gz | |
file: Fix CONFIGURE output relative path
In commit a6fee09484 (file: Add CONFIGURE subcommand, 2020-03-06,
v3.18.0-rc1~584^2) we accidentally treated relative path outputs
with respect to the current working directory. Treat them with
respect to the current binary directory instead.
Fixes: #20885
| -rw-r--r-- | Help/command/file.rst | 3 | ||||
| -rw-r--r-- | Source/cmFileCommand.cxx | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/File_Configure/RunCMakeTest.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/File_Configure/SubDir-check.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/File_Configure/SubDir.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/File_Configure/SubDir/CMakeLists.txt | 1 |
6 files changed, 10 insertions, 3 deletions
diff --git a/Help/command/file.rst b/Help/command/file.rst index bb560a9cf4..5509502568 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -508,8 +508,7 @@ The arguments are: ``OUTPUT <output-file>`` Specify the output file name to generate. A relative path is treated with - respect to the value of :variable:`CMAKE_CURRENT_BINARY_DIR`. See policy - :policy:`CMP0070`. + respect to the value of :variable:`CMAKE_CURRENT_BINARY_DIR`. ``<output-file>`` does not support generator expressions. ``CONTENT <content>`` diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 268c5d1c16..e218a07671 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2862,7 +2862,8 @@ bool HandleConfigureCommand(std::vector<std::string> const& args, // Check for generator expressions const std::string input = args[4]; - std::string outputFile = args[2]; + std::string outputFile = cmSystemTools::CollapseFullPath( + args[2], status.GetMakefile().GetCurrentBinaryDirectory()); std::string::size_type pos = input.find_first_of("<>"); if (pos != std::string::npos) { diff --git a/Tests/RunCMake/File_Configure/RunCMakeTest.cmake b/Tests/RunCMake/File_Configure/RunCMakeTest.cmake index d09d648b24..0337014eba 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 0000000000..1e825878cd --- /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 0000000000..fae60fa721 --- /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 0000000000..6bd962eee4 --- /dev/null +++ b/Tests/RunCMake/File_Configure/SubDir/CMakeLists.txt @@ -0,0 +1 @@ +file(CONFIGURE OUTPUT out.txt CONTENT "") |