[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1107-g3916541

[Brad King]

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  391654193b2be0815c0a546ca0a9a3d6a092af8e (commit)
       via  3fb33e01a1c7a55f35c44a489273f780b21bbca6 (commit)
       via  d425c1104588e82619a461b77e310b15b6dec1d0 (commit)
       via  8235effe482308b640e91ca44f0ffe21546522d0 (commit)
      from  2ac7065953475fdc254e2f64efdf922ca1839229 (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=391654193b2be0815c0a546ca0a9a3d6a092af8e
commit 391654193b2be0815c0a546ca0a9a3d6a092af8e
Merge: 2ac7065 3fb33e0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 9 08:41:55 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 9 08:41:55 2014 -0500

    Merge topic 'doc-find-module-no-summary' into next
    
    3fb33e01 Merge branch 'backport-doc-find-module-no-summary' into doc-find-module-no-summary
    d425c110 Help: Drop FeatureSummary example in cmake-developer.7
    8235effe Help: Drop FeatureSummary example in cmake-developer.7


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fb33e01a1c7a55f35c44a489273f780b21bbca6
commit 3fb33e01a1c7a55f35c44a489273f780b21bbca6
Merge: 8235eff d425c11
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 9 08:40:59 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 9 08:40:59 2014 -0500

    Merge branch 'backport-doc-find-module-no-summary' into doc-find-module-no-summary
    
    Resolve conflict in Help/manual/cmake-developer.7.rst by taking our
    side.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d425c1104588e82619a461b77e310b15b6dec1d0
commit d425c1104588e82619a461b77e310b15b6dec1d0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 9 08:40:33 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 9 08:40:33 2014 -0500

    Help: Drop FeatureSummary example in cmake-developer.7
    
    The use of FeatureSummary inside a find module is not a convention
    yet used by upstream CMake modules.  Drop the example from the
    documentation about how to write find modules.  If in the future
    we add use of FeatureSummary to many of the upstream find modules
    then this example can be restored as part of establishing the
    convention.

diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 0884a59..097d8fc 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -1115,17 +1115,6 @@ not any of its dependencies.  Instead, those dependencies should also be
 targets, and CMake should be told that they are dependencies of this target.
 CMake will then combine all the necessary information automatically.
 
-We should also provide some information about the package, such as where to
-download it.
-
-.. code-block:: cmake
-
-  include(FeatureSummary)
-  set_package_properties(Foo PROPERTIES
-    URL "http://www.foo.example.com/"
-    DESCRIPTION "A library for doing useful things"
-  )
-
 Most of the cache variables should be hidden in the ``ccmake`` interface unless
 the user explicitly asks to edit them.
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8235effe482308b640e91ca44f0ffe21546522d0
commit 8235effe482308b640e91ca44f0ffe21546522d0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 9 08:35:46 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 9 08:40:17 2014 -0500

    Help: Drop FeatureSummary example in cmake-developer.7
    
    The use of FeatureSummary inside a find module is not a convention
    yet used by upstream CMake modules.  Drop the example from the
    documentation about how to write find modules.  If in the future
    we add use of FeatureSummary to many of the upstream find modules
    then this example can be restored as part of establishing the
    convention.

diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 3b9b921..682ce47 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -1093,17 +1093,6 @@ The ``RELEASE`` variant should be listed first in the property
 so that that variant is chosen if the user uses a configuration which is
 not an exact match for any listed ``IMPORTED_CONFIGURATIONS``.
 
-We should also provide some information about the package, such as where to
-download it.
-
-.. code-block:: cmake
-
-  include(FeatureSummary)
-  set_package_properties(Foo PROPERTIES
-    URL "http://www.foo.example.com/"
-    DESCRIPTION "A library for doing useful things"
-  )
-
 Most of the cache variables should be hidden in the ``ccmake`` interface unless
 the user explicitly asks to edit them.
 

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

Summary of changes:
 Help/manual/cmake-developer.7.rst |   11 -----------
 1 file changed, 11 deletions(-)


hooks/post-receive
-- 
CMake