diff options
| author | David Cole <david.cole@kitware.com> | 2012-10-17 20:44:06 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-10-17 20:44:06 (GMT) |
| commit | 7ff422fb8e47c68ce9c23430059d307738d78f7a (patch) | |
| tree | d030e2f58601c2630c6a843705ae0f146efd977f /Source | |
| parent | 5ca2c491730c7ff22a9e4890fad394771c2180c6 (diff) | |
| parent | ddec0533213ef8c7ea80f31d82e4f7baabcd3956 (diff) | |
| download | CMake-7ff422fb8e47c68ce9c23430059d307738d78f7a.zip CMake-7ff422fb8e47c68ce9c23430059d307738d78f7a.tar.gz CMake-7ff422fb8e47c68ce9c23430059d307738d78f7a.tar.bz2 | |
Merge topic 'CPack-ArchiveGen-andDESTIR_ON'
ddec053 Make CPACK_SET_DESTDIR work with archive generator + component-based packaging
Diffstat (limited to 'Source')
| -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 679b8fa..e964696 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 <" |