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 /Source | |
| 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 'Source')
| -rw-r--r-- | Source/cmFileCommand.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 3eea6f3..cb0f05f 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) { |