diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-19 14:07:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-07-19 14:07:12 (GMT) |
| commit | 57534990d812c49bb2f71f5d36b19fa5e2c005a0 (patch) | |
| tree | 0b9a596463b11fc1a9622745985bf89959d34154 | |
| parent | e31084e65745f9dd422c6aff0a2ed4ada6918805 (diff) | |
| download | CMake-57534990d812c49bb2f71f5d36b19fa5e2c005a0.zip CMake-57534990d812c49bb2f71f5d36b19fa5e2c005a0.tar.gz CMake-57534990d812c49bb2f71f5d36b19fa5e2c005a0.tar.bz2 | |
CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
Since commit v3.6.0-rc1~339^2 (CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS
SubDirectory (4th) option, 2016-02-18) we now honor the "Directory"
option of this variable. Prior to that commit the value was not used
so projects may have used a placeholder value like `.` instead of `/`.
Treat `.` the same as `/` to restore compatibility with such projects.
Fixes #16205.
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index c8b075d..f46d145 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -625,7 +625,8 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cmGlobalGenerator gg(&cm); cmsys::auto_ptr<cmMakefile> mf( new cmMakefile(&gg, cm.GetCurrentSnapshot())); - if (!installSubDirectory.empty() && installSubDirectory != "/") { + if (!installSubDirectory.empty() && installSubDirectory != "/" && + installSubDirectory != ".") { tempInstallDirectory += installSubDirectory; } if (componentInstall) { |