diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-19 14:47:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-02-19 14:47:36 (GMT) |
| commit | 3e3a12a4ab5989a34fece99db9002db3822f5924 (patch) | |
| tree | d1e33763cde38727a9241d57946e1998f3ef7acf | |
| parent | 29c266eb56e4e17894574f8a838a372f809d671e (diff) | |
| parent | 26fdd9c30a0a74b8642620478f03d40fee967e56 (diff) | |
| download | CMake-3e3a12a4ab5989a34fece99db9002db3822f5924.zip CMake-3e3a12a4ab5989a34fece99db9002db3822f5924.tar.gz CMake-3e3a12a4ab5989a34fece99db9002db3822f5924.tar.bz2 | |
Merge topic 'fix-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory'
26fdd9c3 CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 3 |
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) { |