summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-07-10 15:04:57 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-07-10 15:05:13 (GMT)
commit546757982841c889a3332623c17610f55a22397c (patch)
tree6aee18f9c5aefe952e50d14966c280154aec9e26 /Help
parentd73ad4ed8b55cae3cd87bc06e7baefddce36944e (diff)
parent741fd1c773fc1208d4001669f737564a67a82c05 (diff)
downloadCMake-546757982841c889a3332623c17610f55a22397c.zip
CMake-546757982841c889a3332623c17610f55a22397c.tar.gz
CMake-546757982841c889a3332623c17610f55a22397c.tar.bz2
Merge topic 'document_object_library_as_a_property_type'
741fd1c773 Help: Add OBJECT_LIBRARY to TYPE target property documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2199
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_tgt/TYPE.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Help/prop_tgt/TYPE.rst b/Help/prop_tgt/TYPE.rst
index 5ac63cc..1cd9db4 100644
--- a/Help/prop_tgt/TYPE.rst
+++ b/Help/prop_tgt/TYPE.rst
@@ -5,5 +5,5 @@ The type of the target.
This read-only property can be used to test the type of the given
target. It will be one of STATIC_LIBRARY, MODULE_LIBRARY,
-SHARED_LIBRARY, INTERFACE_LIBRARY, EXECUTABLE or one of the internal
-target types.
+SHARED_LIBRARY, OBJECT_LIBRARY, INTERFACE_LIBRARY, EXECUTABLE or one
+of the internal target types.