From d4e6b2ae25659699fccf6bc5888e87179f41b23a Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Tue, 9 Jul 2019 17:56:47 +0300 Subject: Refactor: Use `unique_ptr` instead of raw pointer --- Source/CPack/cmCPackGenerator.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index f3de53c..46c602e 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -600,9 +600,9 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( const char* buildConfigCstr = this->GetOption("CPACK_BUILD_CONFIG"); std::string buildConfig = buildConfigCstr ? buildConfigCstr : ""; - cmGlobalGenerator* globalGenerator = + std::unique_ptr globalGenerator( this->MakefileMap->GetCMakeInstance()->CreateGlobalGenerator( - cmakeGenerator); + cmakeGenerator)); if (!globalGenerator) { cmCPackLogger(cmCPackLog::LOG_ERROR, "Specified package generator not found. " @@ -616,12 +616,10 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cmSystemTools::SetForceUnixPaths(globalGenerator->GetForceUnixPaths()); if (!this->RunPreinstallTarget(project.ProjectName, project.Directory, - globalGenerator, buildConfig)) { + globalGenerator.get(), buildConfig)) { return 0; } - delete globalGenerator; - cmCPackLogger(cmCPackLog::LOG_OUTPUT, "- Install project: " << project.ProjectName << std::endl); -- cgit v0.12