[Cmake-commits] CMake branch, next, updated. v3.6.1-1042-ge6bfb7d

[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  e6bfb7d0d6a053aeb105a2480687519095b35b70 (commit)
       via  52aecc0c382384d5bea3c18d7894e80bc573d8d7 (commit)
      from  567b83acbae9f986bbbe0d85770810be4b88836a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6bfb7d0d6a053aeb105a2480687519095b35b70
commit e6bfb7d0d6a053aeb105a2480687519095b35b70
Merge: 567b83a 52aecc0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 2 10:17:49 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 10:17:49 2016 -0400

    Merge topic 'ExternalProject-no-DS_Store' into next
    
    52aecc0c ExternalProject: Ignore macOS .DS_Store files in tarball extraction


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52aecc0c382384d5bea3c18d7894e80bc573d8d7
commit 52aecc0c382384d5bea3c18d7894e80bc573d8d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 1 11:49:17 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 2 10:14:26 2016 -0400

    ExternalProject: Ignore macOS .DS_Store files in tarball extraction
    
    Do not consider a top-level `.DS_Store` file when deciding whether a
    tarball contains exactly one directory whose contents should be used as
    the resulting top-level of the extraction.
    
    Fixes #16218.
    
    Suggested-by: Patrice Kouame

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 7e179aa..4929848 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -993,6 +993,7 @@ endif()
 #
 message(STATUS \"extracting... [analysis]\")
 file(GLOB contents \"\${ut_dir}/*\")
+list(REMOVE_ITEM contents \"\${ut_dir}/.DS_Store\")
 list(LENGTH contents n)
 if(NOT n EQUAL 1 OR NOT IS_DIRECTORY \"\${contents}\")
   set(contents \"\${ut_dir}\")

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

Summary of changes:
 Modules/ExternalProject.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake