summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cmCPackGenerator.cxx
diff options
context:
space:
mode:
authorDaniel Wirtz <daniel.wirtz.stgt@gmail.com>2016-02-17 22:30:05 (GMT)
committerBrad King <brad.king@kitware.com>2016-02-18 14:37:59 (GMT)
commit26fdd9c30a0a74b8642620478f03d40fee967e56 (patch)
tree2db46399a59327f1d901a9a435049c3a8525e4ed /Source/CPack/cmCPackGenerator.cxx
parentede2a6ea6b6ff201ea1b2e2f7943b301a28b1df5 (diff)
downloadCMake-26fdd9c30a0a74b8642620478f03d40fee967e56.zip
CMake-26fdd9c30a0a74b8642620478f03d40fee967e56.tar.gz
CMake-26fdd9c30a0a74b8642620478f03d40fee967e56.tar.bz2
CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
-rw-r--r--Source/CPack/cmCPackGenerator.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 22d4bf0..3eca280 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -723,10 +723,9 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
cmGlobalGenerator gg(&cm);
cmsys::auto_ptr<cmMakefile> mf(
new cmMakefile(&gg, cm.GetCurrentSnapshot()));
- std::string realInstallDirectory = tempInstallDirectory;
if ( !installSubDirectory.empty() && installSubDirectory != "/" )
{
- realInstallDirectory += installSubDirectory;
+ tempInstallDirectory += installSubDirectory;
}
if (componentInstall)
{