diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2019-01-25 14:03:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-28 13:41:28 (GMT) |
| commit | f16dfdf71f8f81e1be9c3ea18652d8d87c1cb265 (patch) | |
| tree | 7a8a17ef3ef7fd6b7adee89ae687d5f7412b0604 /Source/cmQtAutoGenInitializer.cxx | |
| parent | 8e495333c0914a0684d6d82e2cc15327c9f811f3 (diff) | |
| download | CMake-f16dfdf71f8f81e1be9c3ea18652d8d87c1cb265.zip CMake-f16dfdf71f8f81e1be9c3ea18652d8d87c1cb265.tar.gz CMake-f16dfdf71f8f81e1be9c3ea18652d8d87c1cb265.tar.bz2 | |
cmLocalGenerator: Simplify `GetIncludeDirectories`
This patch strips the `stripImplicitDirs` and `appendAllImplicitDirs`
parameters from the `cmLocalGenerator::GetIncludeDirectories` method and makes
it a wrapper into the new `cmLocalGenerator::GetIncludeDirectoriesImplicit`
method. `cmLocalGenerator::GetIncludeDirectoriesImplicit` is the renamed old
implementation of `cmLocalGenerator::GetIncludeDirectories` and still
accepts `stripImplicitDirs` and `appendAllImplicitDirs`.
The motivation is that there's only *one* case where
`cmLocalGenerator::GetIncludeDirectories` is called with the
`stripImplicitDirs` parameter being `false` (QtAutoGen), but many other places
where it is called using the `true` default value.
QtAutoGen is modified to use `cmLocalGenerator::GetIncludeDirectoriesImplicit`
directly. In two use cases of `cmLocalGenerator::GetIncludeDirectories`
the manually set `true` value for `stripImplicitDirs` is removed.
Diffstat (limited to 'Source/cmQtAutoGenInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index e0795d2..817f0b7 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -531,8 +531,8 @@ bool cmQtAutoGenInitializer::InitMoc() // include dirs off, see // https://gitlab.kitware.com/cmake/cmake/issues/13667 std::vector<std::string> dirs; - localGen->GetIncludeDirectories(dirs, this->Target, "CXX", cfg, false, - appendImplicit); + localGen->GetIncludeDirectoriesImplicit(dirs, this->Target, "CXX", cfg, + false, appendImplicit); return dirs; }; |