diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-07 15:26:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-07 15:26:49 (GMT) |
| commit | 02ed66c04bf24d4c13fb6f82d040b835c966bf0c (patch) | |
| tree | 8b73019ebf64ac87e9c41b49835708c2103e3ade /Source | |
| parent | 0746a3398f4e22f80c19b6253c4df652f9c41214 (diff) | |
| parent | 7ddf46230431cd3375f911d4b406af663595861d (diff) | |
| download | CMake-02ed66c04bf24d4c13fb6f82d040b835c966bf0c.zip CMake-02ed66c04bf24d4c13fb6f82d040b835c966bf0c.tar.gz CMake-02ed66c04bf24d4c13fb6f82d040b835c966bf0c.tar.bz2 | |
Merge topic 'unity-include-generated' into release-3.16
7ddf462304 Unity build: Include GENERATED files into unity build
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Julien Schueller <schueller@phimeca.com>
Merge-request: !4001
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 00bd8af..cae47e0 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2441,7 +2441,6 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target) std::back_inserter(filtered_sources), [&](cmSourceFile* sf) { return sf->GetLanguage() == lang && !sf->GetPropertyAsBool("SKIP_UNITY_BUILD_INCLUSION") && - !sf->GetPropertyAsBool("GENERATED") && !sf->GetProperty("COMPILE_OPTIONS") && !sf->GetProperty("COMPILE_DEFINITIONS") && !sf->GetProperty("COMPILE_FLAGS") && |