[Cmake-commits] CMake branch, next, updated. v3.6.2-2023-g63a47fe

[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  63a47fe6c1a37b6f1d8d3cb57a2bfaef3684ecf7 (commit)
       via  e0a8a7b26a4f2cb2aef4cef31f1b61f71f7de2de (commit)
       via  68157b1e88a1adcb2329c8cbe463c280c0609283 (commit)
       via  603cfc410cb4907745719bfa555f7453cb385ecb (commit)
      from  11c17bba362bdb958f80ade09d0fad7a8067c67d (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=63a47fe6c1a37b6f1d8d3cb57a2bfaef3684ecf7
commit 63a47fe6c1a37b6f1d8d3cb57a2bfaef3684ecf7
Merge: 11c17bb e0a8a7b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 09:41:37 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 14 09:41:37 2016 -0400

    Merge topic 'update-kwsys' into next
    
    e0a8a7b2 Merge branch 'upstream-KWSys' into update-kwsys
    68157b1e KWSys 2016-09-14 (e736efa1)
    603cfc41 Revert "Utilities/Release: Suppress KWSys ConsoelBuf test on Windows binaries"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0a8a7b26a4f2cb2aef4cef31f1b61f71f7de2de
commit e0a8a7b26a4f2cb2aef4cef31f1b61f71f7de2de
Merge: 603cfc4 68157b1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 09:41:20 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 14 09:41:20 2016 -0400

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2016-09-14 (e736efa1)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68157b1e88a1adcb2329c8cbe463c280c0609283
commit 68157b1e88a1adcb2329c8cbe463c280c0609283
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Wed Sep 14 09:32:09 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 14 09:41:19 2016 -0400

    KWSys 2016-09-14 (e736efa1)
    
    Code extracted from:
    
        http://public.kitware.com/KWSys.git
    
    at commit e736efa13ad42a4245b95774d114720ad0877c5b (master).
    
    Upstream Shortlog
    -----------------
    
    Brad King (1):
          e736efa1 ConsoleBuf: Always compile test source for host Windows version

diff --git a/testConsoleBuf.cxx b/testConsoleBuf.cxx
index 591a2d1..3dec097 100644
--- a/testConsoleBuf.cxx
+++ b/testConsoleBuf.cxx
@@ -11,6 +11,12 @@
 ============================================================================*/
 #include "kwsysPrivate.h"
 
+// Ignore Windows version levels defined by command-line flags.  This
+// source needs access to all APIs available on the host in order for
+// the test to run properly.  The test binary is not installed anyway.
+#undef _WIN32_WINNT
+#undef NTDDI_VERSION
+
 #include KWSYS_HEADER(Encoding.hxx)
 
 // Work-around CMake dependency scanning limitation.  This must

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=603cfc410cb4907745719bfa555f7453cb385ecb
commit 603cfc410cb4907745719bfa555f7453cb385ecb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 09:41:08 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 14 09:41:08 2016 -0400

    Revert "Utilities/Release: Suppress KWSys ConsoelBuf test on Windows binaries"
    
    This reverts commit da0eaa8917027547cfcb082a076a60af104a2c5c.

diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake
index 0500829..a27efda 100644
--- a/Utilities/Release/win32_release.cmake
+++ b/Utilities/Release/win32_release.cmake
@@ -27,7 +27,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set(GIT_EXTRA "git config core.autocrlf true")
 if(CMAKE_CREATE_VERSION STREQUAL "nightly")
   # Some tests fail spuriously too often.
-  # ConsoleBuf fails on dash3win7 and nowhere else (??).
-  set(EXTRA_CTEST_ARGS "-E 'Qt5Autogen|ConsoleBuf'")
+  set(EXTRA_CTEST_ARGS "-E Qt5Autogen")
 endif()
 include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake
index d053b92..e39a610 100644
--- a/Utilities/Release/win64_release.cmake
+++ b/Utilities/Release/win64_release.cmake
@@ -28,7 +28,6 @@ get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set(GIT_EXTRA "git config core.autocrlf true")
 if(CMAKE_CREATE_VERSION STREQUAL "nightly")
   # Some tests fail spuriously too often.
-  # ConsoleBuf fails on dash3win7 and nowhere else (??).
-  set(EXTRA_CTEST_ARGS "-E 'Qt5Autogen|ConsoleBuf'")
+  set(EXTRA_CTEST_ARGS "-E Qt5Autogen")
 endif()
 include(${path}/release_cmake.cmake)

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

Summary of changes:
 Source/kwsys/testConsoleBuf.cxx       |    6 ++++++
 Utilities/Release/win32_release.cmake |    3 +--
 Utilities/Release/win64_release.cmake |    3 +--
 3 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake