From 273e481e48c855905bde4d91a986c06713df0183 Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Wed, 30 Nov 2016 12:44:47 +0100 Subject: QtAutogen: Inline single use variable --- Source/cmQtAutoGeneratorInitializer.cxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Source') diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 1bdfe32eed..576b2eb443 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -682,13 +682,11 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget( // create a custom target for running generators at buildtime: std::string autogenTargetName = GetAutogenTargetName(target); - std::string targetDir = GetAutogenTargetFilesDir(target); - cmCustomCommandLine currentLine; currentLine.push_back(cmSystemTools::GetCMakeCommand()); currentLine.push_back("-E"); currentLine.push_back("cmake_autogen"); - currentLine.push_back(targetDir); + currentLine.push_back(GetAutogenTargetFilesDir(target)); currentLine.push_back("$"); cmCustomCommandLines commandLines; @@ -850,8 +848,6 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget( "_origin_target_name", cmOutputConverter::EscapeForCMake(target->GetName()).c_str()); - std::string targetDir = GetAutogenTargetFilesDir(target); - const char* qtVersion = makefile->GetDefinition("Qt5Core_VERSION_MAJOR"); if (!qtVersion) { qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR"); @@ -894,7 +890,7 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget( std::string inputFile = cmSystemTools::GetCMakeRoot(); inputFile += "/Modules/AutogenInfo.cmake.in"; - std::string outputFile = targetDir; + std::string outputFile = GetAutogenTargetFilesDir(target); outputFile += "/AutogenInfo.cmake"; makefile->ConfigureFile(inputFile.c_str(), outputFile.c_str(), false, true, false); -- cgit v1.2.1