summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-05-25 19:50:10 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-05-25 19:50:18 (GMT)
commit3a1853b9fda477e729433c8d0329c37345048b0e (patch)
treef319765cd4f1f0d7feabc4e290f55552ceec64c9
parent3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db (diff)
parentb3e4fb5144f8532628899dffb443227857f61e61 (diff)
downloadCMake-3a1853b9fda477e729433c8d0329c37345048b0e.zip
CMake-3a1853b9fda477e729433c8d0329c37345048b0e.tar.gz
CMake-3a1853b9fda477e729433c8d0329c37345048b0e.tar.bz2
Merge topic 'doc-updates'
b3e4fb5144 Help: clarify add_definitions() and add_compile_definitions() behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4786
-rw-r--r--Help/command/add_compile_definitions.rst10
-rw-r--r--Help/command/add_definitions.rst6
2 files changed, 9 insertions, 7 deletions
diff --git a/Help/command/add_compile_definitions.rst b/Help/command/add_compile_definitions.rst
index 8225da7..e10aba0 100644
--- a/Help/command/add_compile_definitions.rst
+++ b/Help/command/add_compile_definitions.rst
@@ -7,10 +7,12 @@ Add preprocessor definitions to the compilation of source files.
add_compile_definitions(<definition> ...)
-Adds preprocessor definitions to the compiler command line for targets in the
-current directory and below (whether added before or after this command is
-invoked). See documentation of the :prop_dir:`directory <COMPILE_DEFINITIONS>`
-and :prop_tgt:`target <COMPILE_DEFINITIONS>` ``COMPILE_DEFINITIONS`` properties.
+Adds preprocessor definitions to the compiler command line.
+
+The preprocessor definitions are added to the :prop_dir:`COMPILE_DEFINITIONS`
+directory property for the current ``CMakeLists`` file. They are also added to
+the :prop_tgt:`COMPILE_DEFINITIONS` target property for each target in the
+current ``CMakeLists`` file.
Definitions are specified using the syntax ``VAR`` or ``VAR=value``.
Function-style definitions are not supported. CMake will automatically
diff --git a/Help/command/add_definitions.rst b/Help/command/add_definitions.rst
index d06b01c..fe69188 100644
--- a/Help/command/add_definitions.rst
+++ b/Help/command/add_definitions.rst
@@ -8,9 +8,9 @@ Add -D define flags to the compilation of source files.
add_definitions(-DFOO -DBAR ...)
Adds definitions to the compiler command line for targets in the current
-directory and below (whether added before or after this command is invoked).
-This command can be used to add any flags, but it is intended to add
-preprocessor definitions.
+directory, whether added before or after this command is invoked, and for
+the ones in sub-directories added after. This command can be used to add any
+flags, but it is intended to add preprocessor definitions.
.. note::