Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into release

This commit is contained in:
Brad King 2016-07-19 10:09:35 -04:00
commit 30dda6724f
1 changed files with 2 additions and 1 deletions

View File

@ -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) {