kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' 

57534990 CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
This commit is contained in:
Brad King 2016-07-20 09:03:22 -04:00 committed by CMake Topic Stage
parent 88ee36f93f 57534990d8
commit 6a98785d8f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CPack/cmCPackGenerator.cxx
View File

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