[Cmake-commits] CMake branch, master, updated. v3.9.0-393-ga2bc632

Kitware Robot kwrobot at kitware.com
Thu Aug 3 09:45:03 EDT 2017


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, master has been updated
       via  a2bc632d060e0b41dd736d3672080eaee5bd0acb (commit)
       via  17d236d5bab40938607f31e29c131acafd2b3ffe (commit)
       via  a7e4d595f9cd4d6c6da66f06e8ba11075ec579f3 (commit)
       via  cc78ff72eb5e7ff3f86d05d6c61197c93d34f84d (commit)
       via  1181ad61d2f5a548d6a823a7fa4bff3a71fa7b3d (commit)
      from  ee79d7a130465bce19864399a9adde4e79c6fd5c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2bc632d060e0b41dd736d3672080eaee5bd0acb
commit a2bc632d060e0b41dd736d3672080eaee5bd0acb
Merge: 17d236d cc78ff7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 3 13:38:13 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Aug 3 09:38:15 2017 -0400

    Merge topic 'doc-buildsystem-fix'
    
    cc78ff72 Help: Fix example in cmake-buildsystem(7) manual
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1097


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17d236d5bab40938607f31e29c131acafd2b3ffe
commit 17d236d5bab40938607f31e29c131acafd2b3ffe
Merge: ee79d7a a7e4d59
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 3 09:35:14 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 3 09:35:14 2017 -0400

    Merge branch 'release-3.9'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc78ff72eb5e7ff3f86d05d6c61197c93d34f84d
commit cc78ff72eb5e7ff3f86d05d6c61197c93d34f84d
Author:     Sebastian Nagel <snbasti94 at gmail.com>
AuthorDate: Sun Jul 23 14:22:00 2017 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 2 16:21:28 2017 -0400

    Help: Fix example in cmake-buildsystem(7) manual
    
    In the example code `serialization` is a PRIVATE dependency of
    `archiveExtras` and not of `archive`.  Fix the corresponding prose.

diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst
index 95f5b87..debaf23 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -266,7 +266,7 @@ The :command:`target_link_libraries` command has ``PRIVATE``,
 
 Because ``archive`` is a ``PUBLIC`` dependency of ``archiveExtras``, the
 usage requirements of it are propagated to ``consumer`` too.  Because
-``serialization`` is a ``PRIVATE`` dependency of ``archive``, the usage
+``serialization`` is a ``PRIVATE`` dependency of ``archiveExtras``, the usage
 requirements of it are not propagated to ``consumer``.
 
 Generally, a dependency should be specified in a use of

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-buildsystem.7.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list