[Cmake-commits] CMake branch, next, updated. v3.5.2-1212-g8dcc19e

[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  8dcc19ebc3a565165a0e3de62f64313a080b7250 (commit)
       via  fa425910b7932ff8c716ae6c2dfe67f79488e4e7 (commit)
      from  6d6ed1aa0e83ef0b4befce8c12bac276b0061b85 (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=8dcc19ebc3a565165a0e3de62f64313a080b7250
commit 8dcc19ebc3a565165a0e3de62f64313a080b7250
Merge: 6d6ed1a fa42591
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 3 09:12:10 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 3 09:12:10 2016 -0400

    Merge topic 'update-libarchive' into next
    
    fa425910 Utilities/Release: Define NTDDI_VERSION for Windows binaries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa425910b7932ff8c716ae6c2dfe67f79488e4e7
commit fa425910b7932ff8c716ae6c2dfe67f79488e4e7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 3 09:09:19 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 3 09:09:19 2016 -0400

    Utilities/Release: Define NTDDI_VERSION for Windows binaries
    
    LibArchive now defines this explicitly if it is not defined already.
    Since we define _WIN32_WINNT explicitly, we must now define a consistent
    value of NTDDI_VERSION explicitly too.

diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake
index 1d3ec86..ba83b26 100644
--- a/Utilities/Release/win32_release.cmake
+++ b/Utilities/Release/win32_release.cmake
@@ -19,7 +19,7 @@ CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
 CMake_INSTALL_DEPENDENCIES:BOOL=ON
 CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x86 -subsystem:console,5.01
 ")
-set(ppflags "-D_WIN32_WINNT=0x501 -D_USING_V110_SDK71_")
+set(ppflags "-D_WIN32_WINNT=0x501 -DNTDDI_VERSION=0x05010000 -D_USING_V110_SDK71_")
 set(CFLAGS "${ppflags}")
 set(CXXFLAGS "${ppflags}")
 set(ENV ". ~/rel/env")
diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake
index b2d4ad1..8e207b5 100644
--- a/Utilities/Release/win64_release.cmake
+++ b/Utilities/Release/win64_release.cmake
@@ -20,7 +20,7 @@ CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
 CMake_INSTALL_DEPENDENCIES:BOOL=ON
 CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x64 -subsystem:console,5.02
 ")
-set(ppflags "-D_WIN32_WINNT=0x502 -D_USING_V110_SDK71_")
+set(ppflags "-D_WIN32_WINNT=0x502 -DNTDDI_VERSION=0x05020000 -D_USING_V110_SDK71_")
 set(CFLAGS "${ppflags}")
 set(CXXFLAGS "${ppflags}")
 set(ENV ". ~/rel/env64")

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

Summary of changes:
 Utilities/Release/win32_release.cmake |    2 +-
 Utilities/Release/win64_release.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake