From 0aa97b6bb798570ea0611153a5614ea5a9ea9875 Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Mon, 4 Nov 2013 08:24:31 -0500 Subject: Fix spelling in INTERFACE_LINK_LIBRARIES documentation (#14542) s/overriden/overridden/ --- Source/cmTarget.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 3598fcc..2c8d04d 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -836,7 +836,7 @@ void cmTarget::DefineProperties(cmake *cm) "CMAKE_LINK_INTERFACE_LIBRARIES if it is set when a target is " "created. " "This property is ignored for STATIC libraries.\n" - "This property is overriden by the INTERFACE_LINK_LIBRARIES property if " + "This property is overridden by the INTERFACE_LINK_LIBRARIES property if " "policy CMP0022 is NEW.\n" "This property is deprecated. Use INTERFACE_LINK_LIBRARIES instead."); @@ -847,7 +847,7 @@ void cmTarget::DefineProperties(cmake *cm) "LINK_INTERFACE_LIBRARIES. " "If set, this property completely overrides the generic property " "for the named configuration.\n" - "This property is overriden by the INTERFACE_LINK_LIBRARIES property if " + "This property is overridden by the INTERFACE_LINK_LIBRARIES property if " "policy CMP0022 is NEW.\n" "This property is deprecated. Use INTERFACE_LINK_LIBRARIES instead."); @@ -858,7 +858,7 @@ void cmTarget::DefineProperties(cmake *cm) "When the target is linked into another target the libraries " "listed (and recursively their link interface libraries) will be " "provided to the other target also. " - "This property is overriden by the LINK_INTERFACE_LIBRARIES or " + "This property is overridden by the LINK_INTERFACE_LIBRARIES or " "LINK_INTERFACE_LIBRARIES_ property if " "policy CMP0022 is OLD or unset.\n" "\n" -- cgit v0.12 From 603fe9253f74d92c6a571cd53d96b91761b4335f Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 4 Nov 2013 08:28:57 -0500 Subject: Fix summary documentation of INTERFACE_LINK_LIBRARIES The property applies to all library types, not just shared libraries. --- Source/cmTarget.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 2c8d04d..4ba6c19 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -853,7 +853,7 @@ void cmTarget::DefineProperties(cmake *cm) cm->DefineProperty ("INTERFACE_LINK_LIBRARIES", cmProperty::TARGET, - "List public interface libraries for a shared library or executable.", + "List public interface libraries for a library.", "This property contains the list of transitive link dependencies. " "When the target is linked into another target the libraries " "listed (and recursively their link interface libraries) will be " -- cgit v0.12 From e9654c632ac735d5fd5a7e1999fbb747410ac7c3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 4 Nov 2013 08:33:36 -0500 Subject: Fix INTERFACE_LINK_LIBRARIES documentation typos Apply the changes from commit 603fe925 (Fix summary documentation of INTERFACE_LINK_LIBRARIES, 2013-11-04) and commit 0aa97b6b (Fix spelling in INTERFACE_LINK_LIBRARIES documentation, 2013-11-04) to the new location of the same documentation. --- Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst | 4 ++-- Help/prop_tgt/LINK_INTERFACE_LIBRARIES.rst | 2 +- Help/prop_tgt/LINK_INTERFACE_LIBRARIES_CONFIG.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst b/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst index 24c2441..64ac46e 100644 --- a/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst +++ b/Help/prop_tgt/INTERFACE_LINK_LIBRARIES.rst @@ -1,12 +1,12 @@ INTERFACE_LINK_LIBRARIES ------------------------ -List public interface libraries for a shared library or executable. +List public interface libraries for a library. This property contains the list of transitive link dependencies. When the target is linked into another target the libraries listed (and recursively their link interface libraries) will be provided to the -other target also. This property is overriden by the +other target also. This property is overridden by the LINK_INTERFACE_LIBRARIES or LINK_INTERFACE_LIBRARIES_ property if policy CMP0022 is OLD or unset. diff --git a/Help/prop_tgt/LINK_INTERFACE_LIBRARIES.rst b/Help/prop_tgt/LINK_INTERFACE_LIBRARIES.rst index 75c2a31..435e25e 100644 --- a/Help/prop_tgt/LINK_INTERFACE_LIBRARIES.rst +++ b/Help/prop_tgt/LINK_INTERFACE_LIBRARIES.rst @@ -16,7 +16,7 @@ the default set is non-empty. This property is initialized by the value of the variable CMAKE_LINK_INTERFACE_LIBRARIES if it is set when a target is created. This property is ignored for STATIC libraries. -This property is overriden by the INTERFACE_LINK_LIBRARIES property if +This property is overridden by the INTERFACE_LINK_LIBRARIES property if policy CMP0022 is NEW. This property is deprecated. Use INTERFACE_LINK_LIBRARIES instead. diff --git a/Help/prop_tgt/LINK_INTERFACE_LIBRARIES_CONFIG.rst b/Help/prop_tgt/LINK_INTERFACE_LIBRARIES_CONFIG.rst index 1a7a941..08bd650 100644 --- a/Help/prop_tgt/LINK_INTERFACE_LIBRARIES_CONFIG.rst +++ b/Help/prop_tgt/LINK_INTERFACE_LIBRARIES_CONFIG.rst @@ -7,7 +7,7 @@ This is the configuration-specific version of LINK_INTERFACE_LIBRARIES. If set, this property completely overrides the generic property for the named configuration. -This property is overriden by the INTERFACE_LINK_LIBRARIES property if +This property is overridden by the INTERFACE_LINK_LIBRARIES property if policy CMP0022 is NEW. This property is deprecated. Use INTERFACE_LINK_LIBRARIES instead. -- cgit v0.12