reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-09 05:16:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

QtAutogen: Inline single use variable

Browse Source
This commit is contained in:
Sebastian Holtermann 2016-11-30 12:44:47 +01:00
parent 6f024008ce
commit 273e481e48
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmQtAutoGeneratorInitializer.cxx
View File

@ -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("$<CONFIGURATION>");
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);