diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-21 21:47:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-02-21 22:05:26 (GMT) |
| commit | 6e89c8a5f1d5aa9bffa95be2b1add8d2c4e55026 (patch) | |
| tree | cc732c0ab42e7435005ac0c51f71b765f28b828e /Source/cmInstallProgramsCommand.cxx | |
| parent | f11f7b34a8e77c3bd68578f00b57e0884cb0d872 (diff) | |
| download | CMake-6e89c8a5f1d5aa9bffa95be2b1add8d2c4e55026.zip CMake-6e89c8a5f1d5aa9bffa95be2b1add8d2c4e55026.tar.gz CMake-6e89c8a5f1d5aa9bffa95be2b1add8d2c4e55026.tar.bz2 | |
install: Support generator expressions in FILES and PROGRAMS mode
Teach the install(FILES) and install(PROGRAMS) commands to evaluate
generator expressions in the list of files.
Extend the ExportImport test to cover installation cases involving
generator expressions.
Diffstat (limited to 'Source/cmInstallProgramsCommand.cxx')
| -rw-r--r-- | Source/cmInstallProgramsCommand.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx index 9f2945f..54d903a 100644 --- a/Source/cmInstallProgramsCommand.cxx +++ b/Source/cmInstallProgramsCommand.cxx @@ -109,7 +109,8 @@ void cmInstallProgramsCommand::FinalPass() std::string cmInstallProgramsCommand ::FindInstallSource(const char* name) const { - if(cmSystemTools::FileIsFullPath(name)) + if(cmSystemTools::FileIsFullPath(name) || + cmGeneratorExpression::Find(name) == 0) { // This is a full path. return name; |