diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-01 14:10:19 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-01 09:10:38 -0500 |
| commit | b2ceca65531abed1a7d3afa6b68953728d05263c (patch) | |
| tree | bf87c04e0d6f716130abf41133fa42a9b55a2c84 /Help | |
| parent | ce0139a1df4b2af1b04ac923d4dd80e873ce1b0c (diff) | |
| parent | d7c60ab6b03a9a8774b43f9bdeb819e42e920ada (diff) | |
| download | cmake-b2ceca65531abed1a7d3afa6b68953728d05263c.tar.gz | |
Merge topic 'doc-ipo'
d7c60ab6b0 Help: mark the directory properties INTERPROCEDURAL_OPTIMIZATION as deprecated
6ed026592e Help: improve docs for INTERPROCEDURAL_OPTIMIZATION target property
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8141
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 4 | ||||
| -rw-r--r-- | Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION.rst | 5 | ||||
| -rw-r--r-- | Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst | 6 | ||||
| -rw-r--r-- | Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 93c6d3eba7..fb84f5ae2d 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -77,8 +77,6 @@ Properties on Directories /prop_dir/IMPORTED_TARGETS /prop_dir/INCLUDE_DIRECTORIES /prop_dir/INCLUDE_REGULAR_EXPRESSION - /prop_dir/INTERPROCEDURAL_OPTIMIZATION - /prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG /prop_dir/LABELS /prop_dir/LINK_DIRECTORIES /prop_dir/LINK_OPTIONS @@ -621,6 +619,8 @@ Deprecated Properties on Directories /prop_dir/ADDITIONAL_MAKE_CLEAN_FILES /prop_dir/COMPILE_DEFINITIONS_CONFIG + /prop_dir/INTERPROCEDURAL_OPTIMIZATION + /prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG /prop_dir/TEST_INCLUDE_FILE diff --git a/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION.rst b/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION.rst index 0c78dfbe7f..6693a43cc7 100644 --- a/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION.rst +++ b/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION.rst @@ -1,7 +1,6 @@ INTERPROCEDURAL_OPTIMIZATION ---------------------------- -Enable interprocedural optimization for targets in a directory. +This directory property does not exist anymore. -If set to true, enables interprocedural optimizations if they are -known to be supported by the compiler. +See the target property :prop_tgt:`INTERPROCEDURAL_OPTIMIZATION` instead. diff --git a/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst b/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst index 840a1dbc70..7ef1bb4490 100644 --- a/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst +++ b/Help/prop_dir/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst @@ -1,8 +1,6 @@ INTERPROCEDURAL_OPTIMIZATION_<CONFIG> ------------------------------------- -Per-configuration interprocedural optimization for a directory. +This directory property does not exist anymore. -This is a per-configuration version of ``INTERPROCEDURAL_OPTIMIZATION``. -If set, this property overrides the generic property for the named -configuration. +See the target property :prop_tgt:`INTERPROCEDURAL_OPTIMIZATION_<CONFIG>` instead. diff --git a/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst b/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst index d3a5e94147..0a4ac9aa5f 100644 --- a/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst +++ b/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst @@ -11,3 +11,7 @@ if interprocedural optimization is enabled but not supported. This property is initialized by the :variable:`CMAKE_INTERPROCEDURAL_OPTIMIZATION` variable if it is set when a target is created. + +There is also the per-configuration :prop_tgt:`INTERPROCEDURAL_OPTIMIZATION_<CONFIG>` +target property, which overrides :prop_tgt:`INTERPROCEDURAL_OPTIMIZATION` +if it is set. |