Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into release
This commit is contained in:
commit
30dda6724f
|
@ -625,7 +625,8 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
|
||||||
cmGlobalGenerator gg(&cm);
|
cmGlobalGenerator gg(&cm);
|
||||||
cmsys::auto_ptr<cmMakefile> mf(
|
cmsys::auto_ptr<cmMakefile> mf(
|
||||||
new cmMakefile(&gg, cm.GetCurrentSnapshot()));
|
new cmMakefile(&gg, cm.GetCurrentSnapshot()));
|
||||||
if (!installSubDirectory.empty() && installSubDirectory != "/") {
|
if (!installSubDirectory.empty() && installSubDirectory != "/" &&
|
||||||
|
installSubDirectory != ".") {
|
||||||
tempInstallDirectory += installSubDirectory;
|
tempInstallDirectory += installSubDirectory;
|
||||||
}
|
}
|
||||||
if (componentInstall) {
|
if (componentInstall) {
|
||||||
|
|
Loading…
Reference in New Issue