diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2018-12-06 17:42:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-12-07 13:01:02 (GMT) |
| commit | 4be7f38d57bdf94a600edace627be8e14f331250 (patch) | |
| tree | 281d8bd11f387031ff54645d5293ef4dc4494afb /Source | |
| parent | 81bea69bd1d52977c3782d26560f34563394f487 (diff) | |
| download | CMake-4be7f38d57bdf94a600edace627be8e14f331250.zip CMake-4be7f38d57bdf94a600edace627be8e14f331250.tar.gz CMake-4be7f38d57bdf94a600edace627be8e14f331250.tar.bz2 | |
Autogen: Revert passing compiler implicit includes to moc
Passing an incomplete list of compiler include directories causes
a regression in the KIO project (and probably others). We need to
disable it until the complete list is available (see #16291).
Fixes: #18669
Issue: #18041
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
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 |