diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-04 15:29:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-04 15:29:44 (GMT) |
| commit | 5c3c2285706cf03e11562b7573f7f75a059a963b (patch) | |
| tree | a73c0cc2e9bb02b31ba70f0e510de024612d9322 | |
| parent | 70307b935193789624fc694b4e94175e902fdc2e (diff) | |
| parent | 63c0bc929240b0dd7253cced980fea0b735eb5c3 (diff) | |
| download | CMake-5c3c2285706cf03e11562b7573f7f75a059a963b.zip CMake-5c3c2285706cf03e11562b7573f7f75a059a963b.tar.gz CMake-5c3c2285706cf03e11562b7573f7f75a059a963b.tar.bz2 | |
Merge topic 'cpack_absolute_package_directory'
63c0bc9292 CPack: Ensure CPACK_PACKAGE_DIRECTORY is an absolute path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3946
| -rw-r--r-- | Source/CPack/cpack.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 5895652..d7868f3 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -314,7 +314,7 @@ int main(int argc, char const* const* argv) else { // get a default value (current working directory) cpackProjectDirectory = cmsys::SystemTools::GetCurrentWorkingDirectory(); - // use default value iff no value has been provided by the config file + // use default value if no value has been provided by the config file if (!globalMF.IsSet("CPACK_PACKAGE_DIRECTORY")) { globalMF.AddDefinition("CPACK_PACKAGE_DIRECTORY", cpackProjectDirectory); @@ -324,6 +324,12 @@ int main(int argc, char const* const* argv) globalMF.AddDefinition(cd.first, cd.second); } + // Force CPACK_PACKAGE_DIRECTORY as absolute path + cpackProjectDirectory = globalMF.GetDefinition("CPACK_PACKAGE_DIRECTORY"); + cpackProjectDirectory = + cmSystemTools::CollapseFullPath(cpackProjectDirectory); + globalMF.AddDefinition("CPACK_PACKAGE_DIRECTORY", cpackProjectDirectory); + const char* cpackModulesPath = globalMF.GetDefinition("CPACK_MODULE_PATH"); if (cpackModulesPath) { globalMF.AddDefinition("CMAKE_MODULE_PATH", cpackModulesPath); |