[Cmake-commits] CMake branch, next, updated. v3.6.1-1294-g15df44b

[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  15df44b216c93a123bcb005b33795e20e49f11f8 (commit)
       via  27591a541c3ee7c0a941295f25610631bf18ca74 (commit)
       via  481c9003fa41e75731bc463cdfa4310e91d5ea4c (commit)
      from  253e20a8ccdf6fd9287faf8cde8af74ecd13c471 (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=15df44b216c93a123bcb005b33795e20e49f11f8
commit 15df44b216c93a123bcb005b33795e20e49f11f8
Merge: 253e20a 27591a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 17 11:10:20 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 17 11:10:20 2016 -0400

    Merge topic 'minor-cleanups' into next
    
    27591a54 Define WIN32_LEAN_AND_MEAN for CMake sources on Windows
    481c9003 libarchive: Fix include order in xxhash.c


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27591a541c3ee7c0a941295f25610631bf18ca74
commit 27591a541c3ee7c0a941295f25610631bf18ca74
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 17 10:43:26 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 17 10:48:28 2016 -0400

    Define WIN32_LEAN_AND_MEAN for CMake sources on Windows
    
    This reduces APIs included by `windows.h`.  We can include the headers
    for those APIs as needed.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index b68675d..e63bf5a 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -45,9 +45,12 @@ endif()
 
 set(EXECUTABLE_OUTPUT_PATH ${CMake_BIN_DIR})
 
-# ensure Unicode friendly APIs are used on Windows
 if(WIN32)
+  # ensure Unicode friendly APIs are used on Windows
   add_definitions(-DUNICODE -D_UNICODE)
+
+  # minimize windows.h content
+  add_definitions(-DWIN32_LEAN_AND_MEAN)
 endif()
 
 # configure the .dox.in file

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=481c9003fa41e75731bc463cdfa4310e91d5ea4c
commit 481c9003fa41e75731bc463cdfa4310e91d5ea4c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 17 10:41:13 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 17 10:48:28 2016 -0400

    libarchive: Fix include order in xxhash.c
    
    We need to include `archive_platform.h` before any system headers in
    order to ensure that `_WIN32_WINNT` is defined early enough.

diff --git a/Utilities/cmlibarchive/libarchive/xxhash.c b/Utilities/cmlibarchive/libarchive/xxhash.c
index d7f8e96..262fecb 100644
--- a/Utilities/cmlibarchive/libarchive/xxhash.c
+++ b/Utilities/cmlibarchive/libarchive/xxhash.c
@@ -29,12 +29,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 You can contact the author at :
 - xxHash source repository : http://code.google.com/p/xxhash/
 */
-#include <stdlib.h>
-#include <string.h>
 
 #include "archive_platform.h"
 #include "archive_xxhash.h"
 
+#include <stdlib.h>
+#include <string.h>
+
 #ifdef HAVE_LIBLZ4
 
 /***************************************

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

Summary of changes:
 Source/CMakeLists.txt                      |    5 ++++-
 Utilities/cmlibarchive/libarchive/xxhash.c |    5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake