[Cmake-commits] CMake branch, next, updated. v3.5.0-490-g07b524a

[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  07b524a13118a8a7e56f87fb9c1d668ad4da46aa (commit)
       via  d66b1e2bced5079e8d6ffc294df6cde7989a55dc (commit)
       via  c113369ecff1a9acbc620170e6bc9eb67a33c6db (commit)
       via  af71ece13a25fec44b928b5c2d5c5fd55b60b98c (commit)
      from  50481066778a343c855a1a6f0ed192032b1c1d91 (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=07b524a13118a8a7e56f87fb9c1d668ad4da46aa
commit 07b524a13118a8a7e56f87fb9c1d668ad4da46aa
Merge: 5048106 d66b1e2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 17 09:31:37 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 17 09:31:37 2016 -0400

    Merge topic 'release-win64' into next
    
    d66b1e2b Utilities/Release: Skip spurious Qt5Autogen test for nightly binary
    c113369e fixup! Utilities/Release: Rename scripts to match target platform
    af71ece1 fixup! Utilities/Release: Create a Windows 64-bit binary


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d66b1e2bced5079e8d6ffc294df6cde7989a55dc
commit d66b1e2bced5079e8d6ffc294df6cde7989a55dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 17 09:21:59 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 17 09:29:06 2016 -0400

    Utilities/Release: Skip spurious Qt5Autogen test for nightly binary
    
    This test fails spuriously too often and prevents the nightly binary
    from finishing.  Simply skip it for the nightly binary to allow it
    to complete more regularly.

diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake
index f25d638..1d3ec86 100644
--- a/Utilities/Release/win32_release.cmake
+++ b/Utilities/Release/win32_release.cmake
@@ -25,4 +25,8 @@ set(CXXFLAGS "${ppflags}")
 set(ENV ". ~/rel/env")
 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.
+  set(EXTRA_CTEST_ARGS "-E Qt5Autogen")
+endif()
 include(${path}/release_cmake.cmake)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c113369ecff1a9acbc620170e6bc9eb67a33c6db
commit c113369ecff1a9acbc620170e6bc9eb67a33c6db
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 17 09:24:04 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 17 09:29:05 2016 -0400

    fixup! Utilities/Release: Rename scripts to match target platform

diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 9abd784..f8844e9 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -13,7 +13,7 @@ set(RELEASE_SCRIPTS_BATCH_1
 )
 
 set(RELEASE_SCRIPTS_BATCH_2
-  dash2win64_cygwin.cmake     # Cygwin
+  cygwin_release.cmake        # Cygwin x86
   win64_release.cmake         # Windows x64
 )
 
diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/cygwin_release.cmake
similarity index 97%
rename from Utilities/Release/dash2win64_cygwin.cmake
rename to Utilities/Release/cygwin_release.cmake
index ca590ed..ca3e794 100644
--- a/Utilities/Release/dash2win64_cygwin.cmake
+++ b/Utilities/Release/cygwin_release.cmake
@@ -17,7 +17,6 @@ CMake_INSTALL_DEPENDENCIES:BOOL=ON
 ")
 set(CXX g++)
 set(CC  gcc)
-set(SCRIPT_NAME dash2win64cygwin)
 set(GIT_EXTRA "git config core.autocrlf false")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af71ece13a25fec44b928b5c2d5c5fd55b60b98c
commit af71ece13a25fec44b928b5c2d5c5fd55b60b98c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 17 09:15:30 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 17 09:26:47 2016 -0400

    fixup! Utilities/Release: Create a Windows 64-bit binary

diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake
index f148e42..cc1f37f 100644
--- a/Utilities/Release/win64_release.cmake
+++ b/Utilities/Release/win64_release.cmake
@@ -3,6 +3,7 @@ set(CONFIGURE_WITH_CMAKE TRUE)
 set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake/bin/cmake.exe")
 set(PROCESSORS 8)
 set(HOST dash3win7)
+set(SCRIPT_NAME dash3win7x64)
 set(RUN_LAUNCHER ~/rel/run)
 set(CPACK_BINARY_GENERATORS "WIX ZIP")
 set(CPACK_SOURCE_GENERATORS "")
@@ -17,9 +18,9 @@ CMAKE_GENERATOR:INTERNAL=Ninja
 BUILD_QtDialog:BOOL:=TRUE
 CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
 CMake_INSTALL_DEPENDENCIES:BOOL=ON
-CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x64 -subsystem:console,5.01
+CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x64 -subsystem:console,5.02
 ")
-set(ppflags "-D_WIN32_WINNT=0x501 -D_USING_V110_SDK71_")
+set(ppflags "-D_WIN32_WINNT=0x502 -D_USING_V110_SDK71_")
 set(CFLAGS "${ppflags}")
 set(CXXFLAGS "${ppflags}")
 set(ENV ". ~/rel/env64")

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

Summary of changes:
 Utilities/Release/create-cmake-release.cmake                      |    2 +-
 .../Release/{dash2win64_cygwin.cmake => cygwin_release.cmake}     |    1 -
 Utilities/Release/win32_release.cmake                             |    4 ++++
 Utilities/Release/win64_release.cmake                             |    5 +++--
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename Utilities/Release/{dash2win64_cygwin.cmake => cygwin_release.cmake} (97%)


hooks/post-receive
-- 
CMake