summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-01 13:14:25 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-11-01 13:14:25 (GMT)
commit01567fd74f1426ebab2499e5e08d33eff5435f99 (patch)
tree231561c97ee64de519383f255a54d0135caf70c2 /Help
parent9c6cf7fcac1f4f23ec21aeb322026d4f422760cc (diff)
parent9a58517df4168a5d928b715fcaa96fc24df9b40c (diff)
downloadCMake-01567fd74f1426ebab2499e5e08d33eff5435f99.zip
CMake-01567fd74f1426ebab2499e5e08d33eff5435f99.tar.gz
CMake-01567fd74f1426ebab2499e5e08d33eff5435f99.tar.bz2
Merge topic 'src-COMPILE_FLAGS-genex'
9a58517d Tests: Add case for Xcode per-config per-source COMPILE_FLAGS diagnostic 1e4bb358 Add generator expression support to per-source COMPILE_FLAGS
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_sf/COMPILE_FLAGS.rst7
-rw-r--r--Help/release/dev/src-COMPILE_FLAGS-genex.rst5
2 files changed, 12 insertions, 0 deletions
diff --git a/Help/prop_sf/COMPILE_FLAGS.rst b/Help/prop_sf/COMPILE_FLAGS.rst
index 086a063..1012164 100644
--- a/Help/prop_sf/COMPILE_FLAGS.rst
+++ b/Help/prop_sf/COMPILE_FLAGS.rst
@@ -6,3 +6,10 @@ Additional flags to be added when compiling this source file.
These flags will be added to the list of compile flags when this
source file builds. 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)`
+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.
diff --git a/Help/release/dev/src-COMPILE_FLAGS-genex.rst b/Help/release/dev/src-COMPILE_FLAGS-genex.rst
new file mode 100644
index 0000000..26cd3ef
--- /dev/null
+++ b/Help/release/dev/src-COMPILE_FLAGS-genex.rst
@@ -0,0 +1,5 @@
+src-COMPILE_FLAGS-genex
+-----------------------
+
+* The :prop_sf:`COMPILE_FLAGS` source file property learned to support
+ :manual:`generator expressions <cmake-generator-expressions(7)>`.