[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6328-gcc50ae8

[Stephen Kelly]

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  cc50ae858eba9c4a1249780e4669b97ae3ab2b13 (commit)
       via  1c2d980cddb3707c2ddf904fdafef76c8d1d641a (commit)
      from  ce27074ec404aeea2a51cc5913be1936181a7bb3 (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=cc50ae858eba9c4a1249780e4669b97ae3ab2b13
commit cc50ae858eba9c4a1249780e4669b97ae3ab2b13
Merge: ce27074 1c2d980
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Dec 20 13:15:10 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 20 13:15:10 2013 -0500

    Merge topic 'cmake-packages-manual' into next
    
    1c2d980 Add cmake/ to the path for consistency with the rest of the docs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c2d980cddb3707c2ddf904fdafef76c8d1d641a
commit 1c2d980cddb3707c2ddf904fdafef76c8d1d641a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Dec 20 19:14:39 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Dec 20 19:14:39 2013 +0100

    Add cmake/ to the path for consistency with the rest of the docs.

diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst
index 8861086..952da3c 100644
--- a/Help/manual/cmake-packages.7.rst
+++ b/Help/manual/cmake-packages.7.rst
@@ -174,13 +174,13 @@ The name of the package version file must match that of the package configuratio
 file but has either ``-version`` or ``Version`` appended to the name before
 the ``.cmake`` extension.  For example, the files::
 
- <prefix>/lib/foo-1.3/foo-config.cmake
- <prefix>/lib/foo-1.3/foo-config-version.cmake
+ <prefix>/lib/cmake/foo-1.3/foo-config.cmake
+ <prefix>/lib/cmake/foo-1.3/foo-config-version.cmake
 
 and::
 
- <prefix>/lib/bar-4.2/BarConfig.cmake
- <prefix>/lib/bar-4.2/BarConfigVersion.cmake
+ <prefix>/lib/cmake/bar-4.2/BarConfig.cmake
+ <prefix>/lib/cmake/bar-4.2/BarConfigVersion.cmake
 
 are each pairs of package configuration files and corresponding package version
 files.

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

Summary of changes:
 Help/manual/cmake-packages.7.rst |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake