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

Merge topic 'fix-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' 

26fdd9c3 CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option
This commit is contained in:
Brad King 2016-02-19 09:47:36 -05:00 committed by CMake Topic Stage
parent 29c266eb56 26fdd9c30a
commit 3e3a12a4ab
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/CPack/cmCPackGenerator.cxx
View File

@ -723,10 +723,9 @@ 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()));
std::string realInstallDirectory = tempInstallDirectory;
if ( !installSubDirectory.empty() && installSubDirectory != "/" ) if ( !installSubDirectory.empty() && installSubDirectory != "/" )
{ {
realInstallDirectory += installSubDirectory; tempInstallDirectory += installSubDirectory;
} }
if (componentInstall) if (componentInstall)
{ {