浏览代码

Help: Document when LINK_FLAGS and STATIC_LIBRARY_FLAGS are used

Robert Maynard 7 年之前
父节点
当前提交
6b17d85873

+ 1 - 1
Help/command/add_link_options.rst

@@ -1,7 +1,7 @@
 add_link_options
 add_link_options
 ----------------
 ----------------
 
 
-Adds options to the link of targets.
+Adds options to the link of shared library, module and executable targets.
 
 
 ::
 ::
 
 

+ 2 - 1
Help/prop_dir/LINK_OPTIONS.rst

@@ -1,7 +1,8 @@
 LINK_OPTIONS
 LINK_OPTIONS
 ------------
 ------------
 
 
-List of options to use for the link step.
+List of options to use for the link step of shared library, module
+and executable targets.
 
 
 This property holds a :ref:`;-list <CMake Language Lists>` of options
 This property holds a :ref:`;-list <CMake Language Lists>` of options
 given so far to the :command:`add_link_options` command.
 given so far to the :command:`add_link_options` command.

+ 3 - 1
Help/prop_tgt/LINK_FLAGS.rst

@@ -1,7 +1,9 @@
 LINK_FLAGS
 LINK_FLAGS
 ----------
 ----------
 
 
-Additional flags to use when linking this target.
+Additional flags to use when linking this target if it is a shared library,
+module library, or an executable. Static libraries need to use
+:prop_tgt:`STATIC_LIBRARY_FLAGS`.
 
 
 The LINK_FLAGS property, managed as a string, can be used to add extra flags
 The LINK_FLAGS property, managed as a string, can be used to add extra flags
 to the link step of a target.  :prop_tgt:`LINK_FLAGS_<CONFIG>` will add to the
 to the link step of a target.  :prop_tgt:`LINK_FLAGS_<CONFIG>` will add to the

+ 2 - 2
Help/prop_tgt/LINK_FLAGS_CONFIG.rst

@@ -1,9 +1,9 @@
 LINK_FLAGS_<CONFIG>
 LINK_FLAGS_<CONFIG>
 -------------------
 -------------------
 
 
-Per-configuration linker flags for a target.
+Per-configuration linker flags for a shared library, module or executable target.
 
 
-This is the configuration-specific version of LINK_FLAGS.
+This is the configuration-specific version of :prop_tgt:`LINK_FLAGS`.
 
 
 .. note::
 .. note::
 
 

+ 8 - 2
Help/prop_tgt/STATIC_LIBRARY_FLAGS.rst

@@ -1,6 +1,12 @@
 STATIC_LIBRARY_FLAGS
 STATIC_LIBRARY_FLAGS
 --------------------
 --------------------
 
 
-Extra flags to use when linking static libraries.
+Archiver (or MSVC librarian) flags for a static library target.
+Targets that are shared libraries, modules, or executables can use
+the :prop_tgt:`LINK_OPTIONS` or :prop_tgt:`LINK_FLAGS` target property.
 
 
-Extra flags to use when linking a static library.
+The STATIC_LIBRARY_FLAGS property, managed as a string, can be used to add
+extra flags to the link step of a static library target.
+:prop_tgt:`STATIC_LIBRARY_FLAGS_<CONFIG>` will add to the configuration
+``<CONFIG>``, for example, ``DEBUG``, ``RELEASE``, ``MINSIZEREL``,
+``RELWITHDEBINFO``, ...

+ 2 - 2
Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst

@@ -1,6 +1,6 @@
 STATIC_LIBRARY_FLAGS_<CONFIG>
 STATIC_LIBRARY_FLAGS_<CONFIG>
 -----------------------------
 -----------------------------
 
 
-Per-configuration flags for creating a static library.
+Per-configuration archiver (or MSVC librarian) flags for a static library target.
 
 
-This is the configuration-specific version of STATIC_LIBRARY_FLAGS.
+This is the configuration-specific version of :prop_tgt:`STATIC_LIBRARY_FLAGS`.