diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-19 10:09:35 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-07-19 10:09:35 -0400 |
| commit | 30dda6724f76c416635cb10341444f617c46600b (patch) | |
| tree | f2e13d853e5e5d27538868721ce610d125eaff9c | |
| parent | ace12c9c158eb2bb649daed699a6d38b7aa2ca6e (diff) | |
| parent | 57534990d812c49bb2f71f5d36b19fa5e2c005a0 (diff) | |
| download | cmake-30dda6724f76c416635cb10341444f617c46600b.tar.gz | |
Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into release
| -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 c8b075d799..f46d145232 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) { |