[Cmake-commits] CMake branch, master, updated. v3.2.1-537-g8bc6cfd
Brad King
brad.king at kitware.com
Mon Mar 30 09:27:50 EDT 2015
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 8bc6cfd72717cbb1166b8aecb38d52d663006284 (commit)
via 230f2d6e7060e70b7205fc65f6bee7ce37e3f27b (commit)
via 564c07f7dd819d9ea070b22ad16849d3be6bb89a (commit)
from ac6297ea3859ff552bce76f68110afc2e9678d9c (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=8bc6cfd72717cbb1166b8aecb38d52d663006284
commit 8bc6cfd72717cbb1166b8aecb38d52d663006284
Merge: ac6297e 230f2d6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 30 09:27:48 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 30 09:27:48 2015 -0400
Merge topic 'ExternalData-recursive-match'
230f2d6e ExternalData: Add option to recursively match under directories
564c07f7 ExternalData: Parameterize internal file(GLOB) operation selection
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/ExternalData-recursive-match.rst | 7 ++++
Modules/ExternalData.cmake | 35 ++++++++++++++++----
Tests/Module/ExternalData/CMakeLists.txt | 1 +
Tests/Module/ExternalData/Data1Check.cmake | 6 ++++
.../{Directory => DirRecurse}/A.dat.md5 | 0
.../{Directory => DirRecurse}/B.dat.md5 | 0
.../{Directory => DirRecurse}/C.dat.md5 | 0
.../{Directory => DirRecurse/Sub1}/A.dat.md5 | 0
.../{Directory => DirRecurse/Sub1}/B.dat.md5 | 0
.../{Directory => DirRecurse/Sub1}/C.dat.md5 | 0
.../{Directory => DirRecurse/Sub2/Dir}/A.dat.md5 | 0
.../{Directory => DirRecurse/Sub2/Dir}/B.dat.md5 | 0
.../{Directory => DirRecurse/Sub2/Dir}/C.dat.md5 | 0
.../BadRecurse1-result.txt} | 0
...adSeries3-stderr.txt => BadRecurse1-stderr.txt} | 4 +--
Tests/RunCMake/ExternalData/BadRecurse1.cmake | 2 ++
.../BadRecurse2-result.txt} | 0
...adSeries3-stderr.txt => BadRecurse2-stderr.txt} | 4 +--
Tests/RunCMake/ExternalData/BadRecurse2.cmake | 2 ++
.../BadRecurse3-result.txt} | 0
...adOption2-stderr.txt => BadRecurse3-stderr.txt} | 6 ++--
Tests/RunCMake/ExternalData/BadRecurse3.cmake | 2 ++
Tests/RunCMake/ExternalData/RunCMakeTest.cmake | 3 ++
23 files changed, 58 insertions(+), 14 deletions(-)
create mode 100644 Help/release/dev/ExternalData-recursive-match.rst
copy Tests/Module/ExternalData/{Directory => DirRecurse}/A.dat.md5 (100%)
copy Tests/Module/ExternalData/{Directory => DirRecurse}/B.dat.md5 (100%)
copy Tests/Module/ExternalData/{Directory => DirRecurse}/C.dat.md5 (100%)
copy Tests/Module/ExternalData/{Directory => DirRecurse/Sub1}/A.dat.md5 (100%)
copy Tests/Module/ExternalData/{Directory => DirRecurse/Sub1}/B.dat.md5 (100%)
copy Tests/Module/ExternalData/{Directory => DirRecurse/Sub1}/C.dat.md5 (100%)
copy Tests/Module/ExternalData/{Directory => DirRecurse/Sub2/Dir}/A.dat.md5 (100%)
copy Tests/Module/ExternalData/{Directory => DirRecurse/Sub2/Dir}/B.dat.md5 (100%)
copy Tests/Module/ExternalData/{Directory => DirRecurse/Sub2/Dir}/C.dat.md5 (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadRecurse1-result.txt} (100%)
copy Tests/RunCMake/ExternalData/{BadSeries3-stderr.txt => BadRecurse1-stderr.txt} (54%)
create mode 100644 Tests/RunCMake/ExternalData/BadRecurse1.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadRecurse2-result.txt} (100%)
copy Tests/RunCMake/ExternalData/{BadSeries3-stderr.txt => BadRecurse2-stderr.txt} (54%)
create mode 100644 Tests/RunCMake/ExternalData/BadRecurse2.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExternalData/BadRecurse3-result.txt} (100%)
copy Tests/RunCMake/ExternalData/{BadOption2-stderr.txt => BadRecurse3-stderr.txt} (50%)
create mode 100644 Tests/RunCMake/ExternalData/BadRecurse3.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list