diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-25 19:50:10 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-25 15:50:18 -0400 |
| commit | 15e725941892a1b9a66a89930a2ab575c422f8fc (patch) | |
| tree | 30186a9ec045ba28be9e13d9a2c2cf4087ca9e2d | |
| parent | f0ff991e427bd29ba5789b526d64b4876964c74f (diff) | |
| parent | b3e4fb5144f8532628899dffb443227857f61e61 (diff) | |
| download | cmake-15e725941892a1b9a66a89930a2ab575c422f8fc.tar.gz | |
Merge topic 'doc-updates' into release-3.17
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.rst | 10 | ||||
| -rw-r--r-- | Help/command/add_definitions.rst | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Help/command/add_compile_definitions.rst b/Help/command/add_compile_definitions.rst index 8225da783e..e10aba022e 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 d06b01c9a4..fe69188363 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:: |