diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-08 12:38:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-05-08 12:38:34 (GMT) |
| commit | c400cd4f3a0ca99882bb2cbba9329447642405cd (patch) | |
| tree | 85e7921e3d0aabd050b5b7c54bff811f8c15d834 | |
| parent | 6a95a097d9bcf0e931011704575a5260ced48911 (diff) | |
| parent | e15adbfed322a7db218a82108cba26bcba57b30c (diff) | |
| download | CMake-c400cd4f3a0ca99882bb2cbba9329447642405cd.zip CMake-c400cd4f3a0ca99882bb2cbba9329447642405cd.tar.gz CMake-c400cd4f3a0ca99882bb2cbba9329447642405cd.tar.bz2 | |
Merge branch 'doc-updates' into release-3.11
Merge-request: !2043
| -rw-r--r-- | Help/prop_sf/COMPILE_FLAGS.rst | 10 | ||||
| -rw-r--r-- | Help/prop_sf/COMPILE_OPTIONS.rst | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Help/prop_sf/COMPILE_FLAGS.rst b/Help/prop_sf/COMPILE_FLAGS.rst index be81cf6..c211b89 100644 --- a/Help/prop_sf/COMPILE_FLAGS.rst +++ b/Help/prop_sf/COMPILE_FLAGS.rst @@ -3,9 +3,9 @@ COMPILE_FLAGS Additional flags to be added when compiling this source file. -The ``COMPILE_FLAGS`` property sets additional compiler flags used to build -source files. Use :prop_sf:`COMPILE_DEFINITIONS` to pass additional -preprocessor definitions. +The ``COMPILE_FLAGS`` property, managed as a string, sets additional compiler +flags used to build source files. Use :prop_sf:`COMPILE_DEFINITIONS` to pass +additional preprocessor definitions. Contents of ``COMPILE_FLAGS`` may use "generator expressions" with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` @@ -13,3 +13,7 @@ manual for available expressions. However, :generator:`Xcode` does not support per-config per-source settings, so expressions that depend on the build configuration are not allowed with that generator. + +.. note:: + + This property has been superseded by the :prop_sf:`COMPILE_OPTIONS` property. diff --git a/Help/prop_sf/COMPILE_OPTIONS.rst b/Help/prop_sf/COMPILE_OPTIONS.rst index 157c0b0..3b2bc8d 100644 --- a/Help/prop_sf/COMPILE_OPTIONS.rst +++ b/Help/prop_sf/COMPILE_OPTIONS.rst @@ -15,3 +15,7 @@ for available expressions. However, :generator:`Xcode` does not support per-config per-source settings, so expressions that depend on the build configuration are not allowed with that generator. + +.. note:: + + This property should be preferred over the :prop_sf:`COMPILE_FLAGS` property. |