diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-02-19 11:57:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-21 15:38:49 (GMT) |
| commit | 754d431813fb4726ca2460641d826240387eb718 (patch) | |
| tree | 6a9c6179a2f40a636efc7bdc43453639cc9b7d48 /Source | |
| parent | cd74daf06f3b12f78bf7aed95ed06ff221a28da3 (diff) | |
| download | CMake-754d431813fb4726ca2460641d826240387eb718.zip CMake-754d431813fb4726ca2460641d826240387eb718.tar.gz CMake-754d431813fb4726ca2460641d826240387eb718.tar.bz2 | |
Autogen: Sort AutogenInfo.cmake.in
Also rename AM_SKIP_MOC to AM_MOC_SKIP
and AM_SKIP_UIC to AM_UIC_SKIP
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 8 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 825eba0..d17faf6 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -194,7 +194,7 @@ static void MocSetupAutoTarget( makefile->AddDefinition( "_moc_options", cmOutputConverter::EscapeForCMake(_moc_options).c_str()); makefile->AddDefinition( - "_skip_moc", + "_moc_skip", cmOutputConverter::EscapeForCMake(cmJoin(skipMoc, ";")).c_str()); bool relaxedMode = makefile->IsOn("CMAKE_AUTOMOC_RELAXED_MODE"); makefile->AddDefinition("_moc_relaxed_mode", relaxedMode ? "TRUE" : "FALSE"); @@ -278,7 +278,7 @@ static void UicSetupAutoTarget( skipped.insert(skipUic.begin(), skipUic.end()); makefile->AddDefinition( - "_skip_uic", + "_uic_skip", cmOutputConverter::EscapeForCMake(cmJoin(skipUic, ";")).c_str()); std::vector<cmSourceFile*> uiFilesWithOptions = @@ -898,10 +898,10 @@ void cmQtAutoGeneratorInitializer::SetupAutoGenerateTarget( SetupSourceFiles(target, mocUicSources, mocUicHeaders, skipMoc, skipUic); } makefile->AddDefinition( - "_moc_uic_sources", + "_sources", cmOutputConverter::EscapeForCMake(cmJoin(mocUicSources, ";")).c_str()); makefile->AddDefinition( - "_moc_uic_headers", + "_headers", cmOutputConverter::EscapeForCMake(cmJoin(mocUicHeaders, ";")).c_str()); if (target->GetPropertyAsBool("AUTOMOC")) { diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index ccdebbb..4149e55 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -307,7 +307,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile( this->Headers); // - Moc - cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SKIP_MOC"), + cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_MOC_SKIP"), this->MocSkipList); cmSystemTools::ExpandListArgument( GetConfigDefinition(makefile, "AM_MOC_COMPILE_DEFINITIONS", config), @@ -319,7 +319,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile( makefile->GetSafeDefinition("AM_MOC_OPTIONS"), this->MocOptions); // - Uic - cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_SKIP_UIC"), + cmSystemTools::ExpandListArgument(makefile->GetSafeDefinition("AM_UIC_SKIP"), this->UicSkipList); cmSystemTools::ExpandListArgument( GetConfigDefinition(makefile, "AM_UIC_TARGET_OPTIONS", config), |