summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-07-16 12:19:35 (GMT)
committerBrad King <brad.king@kitware.com>2018-07-16 12:19:35 (GMT)
commitd240bb9a410b715ef8aae8a40a74bff5504b6dd4 (patch)
tree3aed5fa037e43b3f7c46f52010429c63f9ff26c6 /Help
parente109dc0b2a68999dec742689955b7b2701025d6f (diff)
parent62b4df1e84104f6c30492fdc12f25fb3cc72f736 (diff)
downloadCMake-d240bb9a410b715ef8aae8a40a74bff5504b6dd4.zip
CMake-d240bb9a410b715ef8aae8a40a74bff5504b6dd4.tar.gz
CMake-d240bb9a410b715ef8aae8a40a74bff5504b6dd4.tar.bz2
Merge branch 'doc-add_library-IMPORTED_OBJECTS' into release-3.12
Merge-request: !2216
Diffstat (limited to 'Help')
-rw-r--r--Help/command/add_library.rst7
1 files changed, 5 insertions, 2 deletions
diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst
index 8fa0df7..f20b274 100644
--- a/Help/command/add_library.rst
+++ b/Help/command/add_library.rst
@@ -83,8 +83,11 @@ about the imported library are specified by setting properties whose names
begin in ``IMPORTED_`` and ``INTERFACE_``. The most important such
property is :prop_tgt:`IMPORTED_LOCATION` (and its per-configuration
variant :prop_tgt:`IMPORTED_LOCATION_<CONFIG>`) which specifies the
-location of the main library file on disk. See documentation of the
-``IMPORTED_*`` and ``INTERFACE_*`` properties for more information.
+location of the main library file on disk. Or, for object libraries,
+:prop_tgt:`IMPORTED_OBJECTS` (and :prop_tgt:`IMPORTED_OBJECTS_<CONFIG>`)
+specifies the locations of object files on disk.
+See documentation of the ``IMPORTED_*`` and ``INTERFACE_*`` properties
+for more information.
Object Libraries
^^^^^^^^^^^^^^^^