diff options
author | Eric NOULARD <eric.noulard@gmail.com> | 2012-10-14 16:50:57 (GMT) |
---|---|---|
committer | Eric NOULARD <eric.noulard@gmail.com> | 2012-10-14 16:50:57 (GMT) |
commit | ddec0533213ef8c7ea80f31d82e4f7baabcd3956 (patch) | |
tree | 64a8bcf7f3ef5e11ff5dbaf796467120496639f7 /Source/CPack | |
parent | 3eecc12df06c4a4e62f3366a94acbdcdbf189cd2 (diff) | |
download | CMake-ddec0533213ef8c7ea80f31d82e4f7baabcd3956.zip CMake-ddec0533213ef8c7ea80f31d82e4f7baabcd3956.tar.gz CMake-ddec0533213ef8c7ea80f31d82e4f7baabcd3956.tar.bz2 |
Make CPACK_SET_DESTDIR work with archive generator + component-based packaging
Fix bug #13004. The patch is from Stanislaw Szymczyk.
Diffstat (limited to 'Source/CPack')
-rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index f113400..fb08d36 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -905,7 +905,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( localFileName = cmSystemTools::RelativePath(InstallPrefix, fit->c_str()); localFileName = - localFileName.substr(localFileName.find('/')+1, + localFileName.substr(localFileName.find_first_not_of('/'), std::string::npos); Components[installComponent].Files.push_back(localFileName); cmCPackLogger(cmCPackLog::LOG_DEBUG, "Adding file <" |