diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-01-25 18:09:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-28 13:41:37 (GMT) |
| commit | 03dbb62d31d4a115fed09049cf6995ce89d2fabe (patch) | |
| tree | 4456169913dc7294122ecab14e38d9d566cc50f7 /Source/cmQtAutoGenInitializer.cxx | |
| parent | 5f34bdc7f9f1fd8cca69757b06b3de8fdb4930b7 (diff) | |
| download | CMake-03dbb62d31d4a115fed09049cf6995ce89d2fabe.zip CMake-03dbb62d31d4a115fed09049cf6995ce89d2fabe.tar.gz CMake-03dbb62d31d4a115fed09049cf6995ce89d2fabe.tar.bz2 | |
Autogen: Reenable passing compiler implicit include directories to moc
Since commit 5990ecb741 (Compute implicit include directories from
compiler output, 2018-12-07) we now have compiler implicit include
directory computation for gcc and clang. It should be safe now to pass
these to `moc`. This patch re-enables passing the compiler implicit
include directories to `moc`, which was disabled due to issue #18669.
Fixes: #18041
Issue: #18669
Diffstat (limited to 'Source/cmQtAutoGenInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 817f0b7..1d7f6d1 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -520,13 +520,10 @@ bool cmQtAutoGenInitializer::InitMoc() // Moc includes { - // We need to disable this until we have all implicit includes available. - // See issue #18669. - // bool const appendImplicit = (this->QtVersion.Major >= 5); - + bool const appendImplicit = (this->QtVersion.Major >= 5); auto GetIncludeDirs = - [this, localGen](std::string const& cfg) -> std::vector<std::string> { - bool const appendImplicit = false; + [this, localGen, + appendImplicit](std::string const& cfg) -> std::vector<std::string> { // Get the include dirs for this target, without stripping the implicit // include dirs off, see // https://gitlab.kitware.com/cmake/cmake/issues/13667 |