diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-20 13:03:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-07-20 13:03:22 (GMT) |
| commit | 6a98785d8f76d78447716fa90f93a36060288b8f (patch) | |
| tree | 33cdbe789548c43c1750b61b0bdc03fb1aa8931f /Source/CPack | |
| parent | 88ee36f93f2491a0e1220fd6bdc5018b85c10f24 (diff) | |
| parent | 57534990d812c49bb2f71f5d36b19fa5e2c005a0 (diff) | |
| download | CMake-6a98785d8f76d78447716fa90f93a36060288b8f.zip CMake-6a98785d8f76d78447716fa90f93a36060288b8f.tar.gz CMake-6a98785d8f76d78447716fa90f93a36060288b8f.tar.bz2 | |
Merge topic 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory'
57534990 CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
Diffstat (limited to 'Source/CPack')
| -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 76609e1..58a2243 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -626,7 +626,8 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cmGlobalGenerator gg(&cm); CM_AUTO_PTR<cmMakefile> mf( new cmMakefile(&gg, cm.GetCurrentSnapshot())); - if (!installSubDirectory.empty() && installSubDirectory != "/") { + if (!installSubDirectory.empty() && installSubDirectory != "/" && + installSubDirectory != ".") { tempInstallDirectory += installSubDirectory; } if (componentInstall) { |