diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-02 16:46:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-11-03 12:39:45 (GMT) |
| commit | 98d59417b0c6ac3ea85e315133337030dad93496 (patch) | |
| tree | 74ec336a6debe5e073be6443cb1fed4ac7c2939b /Source/cmAddCustomTargetCommand.cxx | |
| parent | 44cc305ac12d58fe476f815b89f42288455e44a9 (diff) | |
| download | CMake-98d59417b0c6ac3ea85e315133337030dad93496.zip CMake-98d59417b0c6ac3ea85e315133337030dad93496.tar.gz CMake-98d59417b0c6ac3ea85e315133337030dad93496.tar.bz2 | |
add_custom_{command,target}: Fix WORKING_DIRECTORY leading genex
Since commit v3.13.0-rc1~39^2 (add_custom_{command,target}:
WORKING_DIRECTORY generator expressions, 2018-09-22) the
`WORKING_DIRECTORY` option accepts generator expressions.
Fix support for the case of a leading generator expression
by deferring conversion to an absolute path until after
evaluation of the generator expression.
Fixes: #18543
Diffstat (limited to 'Source/cmAddCustomTargetCommand.cxx')
| -rw-r--r-- | Source/cmAddCustomTargetCommand.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Source/cmAddCustomTargetCommand.cxx b/Source/cmAddCustomTargetCommand.cxx index 82ee6b4..ddd9b70 100644 --- a/Source/cmAddCustomTargetCommand.cxx +++ b/Source/cmAddCustomTargetCommand.cxx @@ -181,13 +181,6 @@ bool cmAddCustomTargetCommand::InitialPass( } } - // Convert working directory to a full path. - if (!working_directory.empty()) { - const std::string& build_dir = this->Makefile->GetCurrentBinaryDirectory(); - working_directory = - cmSystemTools::CollapseFullPath(working_directory, build_dir); - } - if (commandLines.empty() && !byproducts.empty()) { this->Makefile->IssueMessage( cmake::FATAL_ERROR, |