[Cmake-commits] CMake branch, next, updated. v3.2.1-1101-g5ac4b47

[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  5ac4b4738ac4eccf5546d2308268035538020a94 (commit)
       via  2779faff9887434dbded61bd61e70df452dd336f (commit)
       via  49ce1077a20cd203f1d87e32114be06bd15520d0 (commit)
      from  3caa1a1c5afc83628dae8312f94b20f32c18c623 (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=5ac4b4738ac4eccf5546d2308268035538020a94
commit 5ac4b4738ac4eccf5546d2308268035538020a94
Merge: 3caa1a1 2779faf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 20 09:44:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 20 09:44:53 2015 -0400

    Merge topic 'file-globbing-directory-listing' into next
    
    2779faff Help: Add notes for topic 'file-globbing-directory-listing'
    49ce1077 fixup! file GLOB list directories handling


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2779faff9887434dbded61bd61e70df452dd336f
commit 2779faff9887434dbded61bd61e70df452dd336f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 20 09:43:37 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 20 09:44:24 2015 -0400

    Help: Add notes for topic 'file-globbing-directory-listing'

diff --git a/Help/release/dev/file-globbing-directory-listing.rst b/Help/release/dev/file-globbing-directory-listing.rst
new file mode 100644
index 0000000..c4d7ba5
--- /dev/null
+++ b/Help/release/dev/file-globbing-directory-listing.rst
@@ -0,0 +1,6 @@
+file-globbing-directory-listing
+-------------------------------
+
+* The :command:`file(GLOB)` and :command:`file(GLOB_RECURSE)` commands
+  learned a new ``LIST_DIRECTORIES <bool>`` option to specify whether
+  the glob result should include directories.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49ce1077a20cd203f1d87e32114be06bd15520d0
commit 49ce1077a20cd203f1d87e32114be06bd15520d0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 20 09:41:38 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 20 09:41:38 2015 -0400

    fixup! file GLOB list directories handling

diff --git a/Help/command/file.rst b/Help/command/file.rst
index bcecb64..2fe7414 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -92,9 +92,12 @@ store it in a ``<variable>``.
 
 ::
 
-  file(GLOB <variable> [LIST_DIRECTORIES true|false] [RELATIVE <path>] [<globbing-expressions>...])
-  file(GLOB_RECURSE <variable> [LIST_DIRECTORIES true|false] [RELATIVE <path>]
-       [FOLLOW_SYMLINKS] [<globbing-expressions>...])
+  file(GLOB <variable>
+       [LIST_DIRECTORIES true|false] [RELATIVE <path>]
+       [<globbing-expressions>...])
+  file(GLOB_RECURSE <variable> [FOLLOW_SYMLINKS]
+       [LIST_DIRECTORIES true|false] [RELATIVE <path>]
+       [<globbing-expressions>...])
 
 Generate a list of files that match the ``<globbing-expressions>`` and
 store it into the ``<variable>``.  Globbing expressions are similar to

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

Summary of changes:
 Help/command/file.rst                                |    9 ++++++---
 Help/release/dev/file-globbing-directory-listing.rst |    6 ++++++
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 Help/release/dev/file-globbing-directory-listing.rst


hooks/post-receive
-- 
CMake