From 87cfe9dd918aa9e98ca4e36f3a6ad13ac83144a8 Mon Sep 17 00:00:00 2001 From: Deniz Bahadir Date: Tue, 30 Apr 2024 18:36:25 +0200 Subject: cmCPackGenerator: Slightly simplify function `InstallProject` --- Source/CPack/cmCPackGenerator.cxx | 14 +++++++------- 1 file 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; } -- cgit v0.12