This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via f603d527cc244247ede1256b5d43bb9432627b7d (commit)
via e9654c632ac735d5fd5a7e1999fbb747410ac7c3 (commit)
via 23087ebcca82e7de4d3927d585db7a212a7270c6 (commit)
via 603fe9253f74d92c6a571cd53d96b91761b4335f (commit)
via 0aa97b6bb798570ea0611153a5614ea5a9ea9875 (commit)
from 4e0fedf1bd71495627eb49a52a8de8e52bdefa98 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f603d527cc244247ede1256b5d43bb9432627b7d
commit f603d527cc244247ede1256b5d43bb9432627b7d
Merge: 4e0fedf e9654c6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 4 08:35:58 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Nov 4 08:35:58 2013 -0500
Merge topic 'policy-CMP0022-fixes-for-master' into next
e9654c6 Fix INTERFACE_LINK_LIBRARIES documentation typos
23087eb Merge branch 'policy-CMP0022-fixes' into
policy-CMP0022-fixes-for-master
603fe92 Fix summary documentation of INTERFACE_LINK_LIBRARIES
0aa97b6 Fix spelling in INTERFACE_LINK_LIBRARIES documentation (#14542)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9654c632ac735d5fd5a7e1999fbb747410ac7c3
commit e9654c632ac735d5fd5a7e1999fbb747410ac7c3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 4 08:33:36 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 4 08:33:38 2013 -0500
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.
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_<CONFIG> 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.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23087ebcca82e7de4d3927d585db7a212a7270c6
commit 23087ebcca82e7de4d3927d585db7a212a7270c6
Merge: b4a1f44 603fe92
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 4 08:32:16 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 4 08:32:16 2013 -0500
Merge branch 'policy-CMP0022-fixes' into policy-CMP0022-fixes-for-master
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=603fe9253f74d92c6a571cd53d96b91761b4335f
commit 603fe9253f74d92c6a571cd53d96b91761b4335f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 4 08:28:57 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 4 08:29:00 2013 -0500
Fix summary documentation of INTERFACE_LINK_LIBRARIES
The property applies to all library types, not just shared libraries.
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 "
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0aa97b6bb798570ea0611153a5614ea5a9ea9875
commit 0aa97b6bb798570ea0611153a5614ea5a9ea9875
Author: Modestas Vainius <mo...@debian.org>
AuthorDate: Mon Nov 4 08:24:31 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 4 08:26:09 2013 -0500
Fix spelling in INTERFACE_LINK_LIBRARIES documentation (#14542)
s/overriden/overridden/
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_<CONFIG> property if "
"policy CMP0022 is OLD or unset.\n"
"\n"
-----------------------------------------------------------------------
Summary of changes:
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(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
