diff options
| author | Brad King <brad.king@kitware.com> | 2018-12-10 13:16:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-10 13:16:20 (GMT) |
| commit | 5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a (patch) | |
| tree | 764f4152b78436a1813e4cb252f83fb708f3c94c | |
| parent | 4b513c0ca31d5a90b283b794397e40168070e400 (diff) | |
| parent | e5a4007a3b4aefeb3d814adb75835adc6111e238 (diff) | |
| download | CMake-5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a.zip CMake-5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a.tar.gz CMake-5f3b067bee1b30b6d74ef48f31e9e2bbb27cd27a.tar.bz2 | |
Merge topic 'autogen_revert_implicit_includes'
e5a4007a3b Merge branch 'backport-autogen_revert_implicit_includes'
4be7f38d57 Autogen: Revert passing compiler implicit includes to moc
187481d4d9 Autogen: Revert passing compiler implicit includes to moc
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2709
| -rw-r--r-- | Help/release/3.13.rst | 13 | ||||
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 9 | ||||
| -rw-r--r-- | Tests/QtAutogen/Tests.cmake | 3 |
3 files changed, 21 insertions, 4 deletions
diff --git a/Help/release/3.13.rst b/Help/release/3.13.rst index 9f7e61f..68e05c3 100644 --- a/Help/release/3.13.rst +++ b/Help/release/3.13.rst @@ -239,3 +239,16 @@ Other Changes These internal implementation modules are also no longer available to scripts that may have been incorrectly including them, because they should never have been available in the first place. + +Updates +======= + +Changes made since CMake 3.13.0 include the following. + +3.13.2 +------ + +* CMake 3.13.0 included a change to pass compiler implicit include + directories to the ``moc`` tool for :prop_tgt:`AUTOMOC`. This has + been reverted due to regressing existing builds and will need + further investigation before being re-introduced in a later release. diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index d4819a3..9dfd9db 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -489,10 +489,13 @@ bool cmQtAutoGenInitializer::InitMoc() // Moc includes { - bool const appendImplicit = (this->QtVersion.Major == 5); + // We need to disable this until we have all implicit includes available. + // See issue #18669. + // bool const appendImplicit = (this->QtVersion.Major == 5); + auto GetIncludeDirs = - [this, localGen, - appendImplicit](std::string const& cfg) -> std::vector<std::string> { + [this, localGen](std::string const& cfg) -> std::vector<std::string> { + bool const appendImplicit = false; // Get the include dirs for this target, without stripping the implicit // include dirs off, see // https://gitlab.kitware.com/cmake/cmake/issues/13667 diff --git a/Tests/QtAutogen/Tests.cmake b/Tests/QtAutogen/Tests.cmake index 096d5e3..c53fb4f 100644 --- a/Tests/QtAutogen/Tests.cmake +++ b/Tests/QtAutogen/Tests.cmake @@ -39,7 +39,8 @@ endif() # Qt5 only tests if(QT_TEST_VERSION GREATER 4) ADD_AUTOGEN_TEST(MocMacroName mocMacroName) - ADD_AUTOGEN_TEST(MocOsMacros) + # Disabled for issue #18669 + #ADD_AUTOGEN_TEST(MocOsMacros) ADD_AUTOGEN_TEST(RerunMocPlugin) if(APPLE) ADD_AUTOGEN_TEST(MacOsFW) |