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 /Help | |
| 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 'Help')
| -rw-r--r-- | Help/prop_tgt/UNITY_BUILD.rst | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Help/prop_tgt/UNITY_BUILD.rst b/Help/prop_tgt/UNITY_BUILD.rst index 2faad92..fab4f15 100644 --- a/Help/prop_tgt/UNITY_BUILD.rst +++ b/Help/prop_tgt/UNITY_BUILD.rst @@ -40,9 +40,8 @@ Since multiple source files are included into one source file, it can lead to ODR errors. This section contains properties which help fixing these errors. -The source files marked by :prop_sf:`GENERATED` will be skipped -from unity build. This applies also for the source files marked -with :prop_sf:`SKIP_UNITY_BUILD_INCLUSION`. +The source files marked by :prop_sf:`SKIP_UNITY_BUILD_INCLUSION` +will be skipped from unity build. The source files that have :prop_sf:`COMPILE_OPTIONS`, :prop_sf:`COMPILE_DEFINITIONS`, :prop_sf:`COMPILE_FLAGS`, or |