diff options
| author | Morné Chamberlain <thefreeman.za@gmail.com> | 2012-10-17 21:29:53 (GMT) |
|---|---|---|
| committer | Morné Chamberlain <thefreeman.za@gmail.com> | 2012-10-17 21:29:53 (GMT) |
| commit | d022d4ec78bcb0d3be93479b514f5275703d9a30 (patch) | |
| tree | c2353ce4b5416bf60321485050dda7e4c56a4ff9 /Source/CPack/cmCPackGenerator.cxx | |
| parent | 9cd3e7071f1769eb6bd751a501d36c6130019a1a (diff) | |
| parent | 7ded904329635b490467ddf06d87b2620da470aa (diff) | |
| download | CMake-d022d4ec78bcb0d3be93479b514f5275703d9a30.zip CMake-d022d4ec78bcb0d3be93479b514f5275703d9a30.tar.gz CMake-d022d4ec78bcb0d3be93479b514f5275703d9a30.tar.bz2 | |
Merge branch 'master' into sublime-text-2-generator
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index f113400..e964696 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -855,7 +855,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( // If CPack was asked to warn on ABSOLUTE INSTALL DESTINATION // then forward request to cmake_install.cmake script - if (this->GetOption("CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION")) + if (this->IsOn("CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION")) { mf->AddDefinition("CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION", "1"); @@ -865,7 +865,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( // then ask cmake_install.cmake script to error out // as soon as it occurs (before installing file) if (!SupportsAbsoluteDestination() || - this->GetOption("CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION")) + this->IsOn("CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION")) { mf->AddDefinition("CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION", "1"); @@ -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 <" |