diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-02-16 18:02:57 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-02-16 18:02:57 (GMT) |
| commit | 337c1f0b7230d6b0b4674d1d7168eef5a6dce6cd (patch) | |
| tree | 12e3a40ae474f4b52af174a1750d8accd141558d /Source/CPack | |
| parent | 24b49f92586459dc6b02605c8ee3396c28607fe1 (diff) | |
| download | CMake-337c1f0b7230d6b0b4674d1d7168eef5a6dce6cd.zip CMake-337c1f0b7230d6b0b4674d1d7168eef5a6dce6cd.tar.gz CMake-337c1f0b7230d6b0b4674d1d7168eef5a6dce6cd.tar.bz2 | |
ENH: fix DESTDIR install
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 516c975..ec34058 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -395,13 +395,12 @@ int cmCPackGenerator::InstallProjectViaInstallScript( // underneath the tempInstallDirectory. The value of the project's // CMAKE_INSTALL_PREFIX is sent in here as the value of the // CPACK_INSTALL_PREFIX variable. - std::string dir = tempInstallDirectory; + std::string dir; if (this->GetOption("CPACK_INSTALL_PREFIX")) { dir += this->GetOption("CPACK_INSTALL_PREFIX"); } this->SetOption("CMAKE_INSTALL_PREFIX", dir.c_str()); - cmCPackLogger(cmCPackLog::LOG_DEBUG, "- Using DESTDIR + CPACK_INSTALL_PREFIX... (this->SetOption)" << std::endl); @@ -555,7 +554,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( // underneath the tempInstallDirectory. The value of the project's // CMAKE_INSTALL_PREFIX is sent in here as the value of the // CPACK_INSTALL_PREFIX variable. - std::string dir = tempInstallDirectory; + std::string dir; if (this->GetOption("CPACK_INSTALL_PREFIX")) { dir += this->GetOption("CPACK_INSTALL_PREFIX"); |