kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix DESTDIR install

This commit is contained in:
Bill Hoffman 2008-02-16 13:02:57 -05:00
parent 24b49f9258
commit 337c1f0b72
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CPack/cmCPackGenerator.cxx
View File

@ -395,13 +395,12 @@ int cmCPackGenerator::InstallProjectViaInstallScript(
// underneath the tempInstallDirectory. The value of the project's // underneath the tempInstallDirectory. The value of the project's
// CMAKE_INSTALL_PREFIX is sent in here as the value of the // CMAKE_INSTALL_PREFIX is sent in here as the value of the
// CPACK_INSTALL_PREFIX variable. // CPACK_INSTALL_PREFIX variable.
std::string dir = tempInstallDirectory; std::string dir;
if (this->GetOption("CPACK_INSTALL_PREFIX")) if (this->GetOption("CPACK_INSTALL_PREFIX"))
{ {
dir += this->GetOption("CPACK_INSTALL_PREFIX"); dir += this->GetOption("CPACK_INSTALL_PREFIX");
} }
this->SetOption("CMAKE_INSTALL_PREFIX", dir.c_str()); this->SetOption("CMAKE_INSTALL_PREFIX", dir.c_str());
cmCPackLogger(cmCPackLog::LOG_DEBUG, cmCPackLogger(cmCPackLog::LOG_DEBUG,
"- Using DESTDIR + CPACK_INSTALL_PREFIX... (this->SetOption)" "- Using DESTDIR + CPACK_INSTALL_PREFIX... (this->SetOption)"
<< std::endl); << std::endl);
@ -555,7 +554,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
// underneath the tempInstallDirectory. The value of the project's // underneath the tempInstallDirectory. The value of the project's
// CMAKE_INSTALL_PREFIX is sent in here as the value of the // CMAKE_INSTALL_PREFIX is sent in here as the value of the
// CPACK_INSTALL_PREFIX variable. // CPACK_INSTALL_PREFIX variable.
std::string dir = tempInstallDirectory; std::string dir;
if (this->GetOption("CPACK_INSTALL_PREFIX")) if (this->GetOption("CPACK_INSTALL_PREFIX"))
{ {
dir += this->GetOption("CPACK_INSTALL_PREFIX"); dir += this->GetOption("CPACK_INSTALL_PREFIX");