summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-03-18 13:43:23 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-03-18 13:43:23 (GMT)
commit9cdb37e9175b2e3c6367bc4863fda0404cb1c3a2 (patch)
tree3f9a50fdc4fbd93b27a1de1ed4e6a030722b32ce
parent1bcdc4db1bcfc75cf9813bc279840b975e74892d (diff)
parentc089485d2131c7074c931b99044b8d00d498f414 (diff)
downloadCMake-9cdb37e9175b2e3c6367bc4863fda0404cb1c3a2.zip
CMake-9cdb37e9175b2e3c6367bc4863fda0404cb1c3a2.tar.gz
CMake-9cdb37e9175b2e3c6367bc4863fda0404cb1c3a2.tar.bz2
Merge topic 'release-win64'
c089485d Utilities/Release: Skip spurious Qt5Autogen test for nightly binary e903a9fc Utilities/Release: Create a Windows 64-bit binary dd630075 Utilities/Release: Rename scripts to match target platform
-rw-r--r--Tests/CMakeLists.txt11
-rw-r--r--Utilities/Release/create-cmake-release.cmake9
-rw-r--r--Utilities/Release/cygwin_release.cmake (renamed from Utilities/Release/dash2win64_cygwin.cmake)1
-rw-r--r--Utilities/Release/linux32_release.cmake (renamed from Utilities/Release/magrathea_release.cmake)0
-rw-r--r--Utilities/Release/osx_release.cmake (renamed from Utilities/Release/bigmac_release.cmake)0
-rw-r--r--Utilities/Release/win32_release.cmake (renamed from Utilities/Release/dash3win7_release.cmake)4
-rw-r--r--Utilities/Release/win64_release.cmake29
7 files changed, 45 insertions, 9 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 76ea5b4..8a256bf 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -684,14 +684,17 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
endif()
endmacro()
if(CMAKE_BUILD_NIGHTLY_RELEASES)
- ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
- dash3win7_release.cmake)
+ ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin32
+ win32_release.cmake)
+ ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin64
+ win64_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
- bigmac_release.cmake)
+ osx_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
- magrathea_release.cmake)
+ linux32_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64
linux64_release.cmake)
+ set_property(TEST CMakeNightlyWin64 PROPERTY DEPENDS CMakeNightlyWin32)
endif()
# add tests with more complex invocations
diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index 403367b..f8844e9 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -6,14 +6,15 @@ endif()
file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
set(RELEASE_SCRIPTS_BATCH_1
- dash3win7_release.cmake # Windows
- bigmac_release.cmake # OS X x86_64
- magrathea_release.cmake # Linux
+ win32_release.cmake # Windows x86
+ osx_release.cmake # OS X x86_64
+ linux32_release.cmake # Linux x86
linux64_release.cmake # Linux x86_64
)
set(RELEASE_SCRIPTS_BATCH_2
- dash2win64_cygwin.cmake # Cygwin
+ cygwin_release.cmake # Cygwin x86
+ win64_release.cmake # Windows x64
)
function(write_batch_shell_script filename)
diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/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)
diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/linux32_release.cmake
index 00abcc1..00abcc1 100644
--- a/Utilities/Release/magrathea_release.cmake
+++ b/Utilities/Release/linux32_release.cmake
diff --git a/Utilities/Release/bigmac_release.cmake b/Utilities/Release/osx_release.cmake
index 568a98c..568a98c 100644
--- a/Utilities/Release/bigmac_release.cmake
+++ b/Utilities/Release/osx_release.cmake
diff --git a/Utilities/Release/dash3win7_release.cmake b/Utilities/Release/win32_release.cmake
index f25d638..1d3ec86 100644
--- a/Utilities/Release/dash3win7_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)
diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake
new file mode 100644
index 0000000..cc1f37f
--- /dev/null
+++ b/Utilities/Release/win64_release.cmake
@@ -0,0 +1,29 @@
+set(CMAKE_RELEASE_DIRECTORY "c:/msys64/home/dashboard/CMakeReleaseDirectory64")
+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 "")
+set(MAKE_PROGRAM "ninja")
+set(MAKE "${MAKE_PROGRAM} -j8")
+set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_DOC_DIR:STRING=doc/cmake
+CMAKE_USE_OPENSSL:BOOL=OFF
+CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
+CMAKE_Fortran_COMPILER:FILEPATH=FALSE
+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.02
+")
+set(ppflags "-D_WIN32_WINNT=0x502 -D_USING_V110_SDK71_")
+set(CFLAGS "${ppflags}")
+set(CXXFLAGS "${ppflags}")
+set(ENV ". ~/rel/env64")
+get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(GIT_EXTRA "git config core.autocrlf true")
+include(${path}/release_cmake.cmake)