[Cmake-commits] CMake branch, next, updated. v3.2.2-2631-g7ca1bb2

[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  7ca1bb2935a32a6cbed91ecca271e40e975b8761 (commit)
       via  f39d26caa77525ee12b8f5fcb4932ebb642c970f (commit)
       via  4566850bdd48c53997c5aea4489d5949c7d26b0b (commit)
      from  219abbcf5fcbb9982e5881f69d87130a7dc9133c (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=7ca1bb2935a32a6cbed91ecca271e40e975b8761
commit 7ca1bb2935a32a6cbed91ecca271e40e975b8761
Merge: 219abbc f39d26c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 8 09:31:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 8 09:31:14 2015 -0400

    Merge topic 'doc-file-COPY-preserves-structure' into next
    
    f39d26ca Help: Clarify file(COPY) directory semantics (#15561)
    4566850b CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f39d26caa77525ee12b8f5fcb4932ebb642c970f
commit f39d26caa77525ee12b8f5fcb4932ebb642c970f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 8 09:28:44 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 8 09:29:05 2015 -0400

    Help: Clarify file(COPY) directory semantics (#15561)
    
    State explicitly that directory structure is preserved.

diff --git a/Help/command/file.rst b/Help/command/file.rst
index 2fe7414..bbddd40 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -313,8 +313,12 @@ preserves input file timestamps, and optimizes out a file if it exists
 at the destination with the same timestamp.  Copying preserves input
 permissions unless explicit permissions or ``NO_SOURCE_PERMISSIONS``
 are given (default is ``USE_SOURCE_PERMISSIONS``).
+
 See the :command:`install(DIRECTORY)` command for documentation of
-permissions, ``PATTERN``, ``REGEX``, and ``EXCLUDE`` options.
+permissions, ``FILES_MATCHING``, ``PATTERN``, ``REGEX``, and
+``EXCLUDE`` options.  Copying directories preserves the structure
+of their content even if options are used to select a subset of
+files.
 
 The ``INSTALL`` signature differs slightly from ``COPY``: it prints
 status messages (subject to the :variable:`CMAKE_INSTALL_MESSAGE` variable),

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

Summary of changes:
 Help/command/file.rst     |    6 +++++-
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake