diff options
| author | Deniz Bahadir <deniz@code.bahadir.email> | 2024-04-30 16:36:25 (GMT) |
|---|---|---|
| committer | Deniz Bahadir <deniz@code.bahadir.email> | 2024-04-30 16:36:25 (GMT) |
| commit | 87cfe9dd918aa9e98ca4e36f3a6ad13ac83144a8 (patch) | |
| tree | 5e250931442d7eb3065a72506ad4f7a4818876b0 | |
| parent | 1350ed96ffbc05c6b00289fc2cafe438e2b7e5fd (diff) | |
| download | CMake-87cfe9dd918aa9e98ca4e36f3a6ad13ac83144a8.zip CMake-87cfe9dd918aa9e98ca4e36f3a6ad13ac83144a8.tar.gz CMake-87cfe9dd918aa9e98ca4e36f3a6ad13ac83144a8.tar.bz2 | |
cmCPackGenerator: Slightly simplify function `InstallProject`
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index fb3df2e..576b302 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -197,20 +197,20 @@ int cmCPackGenerator::InstallProject() std::string bareTempInstallDirectory = this->GetOption("CPACK_TEMPORARY_DIRECTORY"); - std::string tempInstallDirectoryStr = bareTempInstallDirectory; + std::string tempInstallDirectory = bareTempInstallDirectory; bool setDestDir = this->GetOption("CPACK_SET_DESTDIR").IsOn() || cmIsInternallyOn(this->GetOption("CPACK_SET_DESTDIR")); if (!setDestDir) { - tempInstallDirectoryStr += this->GetPackagingInstallPrefix(); + tempInstallDirectory += this->GetPackagingInstallPrefix(); } - const char* tempInstallDirectory = tempInstallDirectoryStr.c_str(); int res = 1; if (!cmsys::SystemTools::MakeDirectory(bareTempInstallDirectory)) { - cmCPackLogger(cmCPackLog::LOG_ERROR, - "Problem creating temporary directory: " - << (tempInstallDirectory ? tempInstallDirectory : "(NULL)") - << std::endl); + cmCPackLogger( + cmCPackLog::LOG_ERROR, + "Problem creating temporary directory: " + << (!tempInstallDirectory.empty() ? tempInstallDirectory : "(NULL)") + << std::endl); return 0; } |