diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-09-29 10:31:22 +0200 |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-09-29 15:00:47 +0200 |
| commit | 1d7f099d9cf489872a70b7616ff644cd4a91a7ae (patch) | |
| tree | feecd79956890f7a5677b5add49a0cf651eb6acf /Source | |
| parent | e182ba735e17bd5625ddfe7f796a123a383ff02f (diff) | |
| download | cmake-1d7f099d9cf489872a70b7616ff644cd4a91a7ae.tar.gz | |
Autogen: Add (CMAKE_)AUTOMOC_COMPILER_PREDEFINES
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 13 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index c6f0a51c9c..217865b53f 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -363,11 +363,14 @@ static void SetupAutoTargetMoc(cmQtAutoGenDigest const& digest, AddDefinitionEscaped(makefile, "_moc_depend_filters", GetSafeProperty(target, "AUTOMOC_DEPEND_FILTERS")); - if (QtVersionGreaterOrEqual(digest.QtVersionMajor, digest.QtVersionMinor, 5, - 8)) { - AddDefinitionEscaped( - makefile, "_moc_predefs_cmd", - makefile->GetSafeDefinition("CMAKE_CXX_COMPILER_PREDEFINES_COMMAND")); + // Compiler predefines + if (target->GetPropertyAsBool("AUTOMOC_COMPILER_PREDEFINES")) { + if (QtVersionGreaterOrEqual(digest.QtVersionMajor, digest.QtVersionMinor, + 5, 8)) { + AddDefinitionEscaped( + makefile, "_moc_predefs_cmd", + makefile->GetSafeDefinition("CMAKE_CXX_COMPILER_PREDEFINES_COMMAND")); + } } // Moc includes and compile definitions { diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 49b0664640..7a3cc76dd3 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -244,6 +244,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnums::TargetType type, this->SetPropertyDefault("AUTOMOC", nullptr); this->SetPropertyDefault("AUTOUIC", nullptr); this->SetPropertyDefault("AUTORCC", nullptr); + this->SetPropertyDefault("AUTOMOC_COMPILER_PREDEFINES", nullptr); this->SetPropertyDefault("AUTOMOC_DEPEND_FILTERS", nullptr); this->SetPropertyDefault("AUTOMOC_MACRO_NAMES", nullptr); this->SetPropertyDefault("AUTOMOC_MOC_OPTIONS", nullptr); |