Browse Source

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 <[email protected]>
Merge-request: !8141
Brad King 2 years ago
parent
commit
b2ceca6553

+ 2 - 2
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
 
 

+ 2 - 3
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.

+ 2 - 4
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.

+ 4 - 0
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.