Utilities/Release: Switch to .msi builder for Windows binary
Use a new build machine to produce the Windows binary using the CPack WiX generator to produce a `.msi` installer.
This commit is contained in:
parent
240b065faa
commit
083312a8fd
|
@ -0,0 +1,7 @@
|
|||
release-windows
|
||||
---------------
|
||||
|
||||
* The precompiled Windows binary provided on ``cmake.org`` is now a
|
||||
``.msi`` package instead of an installer executable. One may need
|
||||
to manually uninstall CMake versions lower than 3.5 before installing
|
||||
the new package.
|
|
@ -685,7 +685,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
|
|||
endmacro()
|
||||
if(CMAKE_BUILD_NIGHTLY_RELEASES)
|
||||
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows
|
||||
dash2win64_release.cmake)
|
||||
dash3win7_release.cmake)
|
||||
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
|
||||
dashmacmini5_release.cmake)
|
||||
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
|
||||
|
|
|
@ -6,7 +6,7 @@ endif()
|
|||
file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs)
|
||||
|
||||
set(RELEASE_SCRIPTS_BATCH_1
|
||||
dash2win64_release.cmake # Windows
|
||||
dash3win7_release.cmake # Windows
|
||||
dashmacmini5_release.cmake # OS X x86_64
|
||||
magrathea_release.cmake # Linux
|
||||
linux64_release.cmake # Linux x86_64
|
||||
|
|
|
@ -1,23 +1,24 @@
|
|||
set(CMAKE_RELEASE_DIRECTORY "c:/cygwin/home/dashboard/CMakeReleaseDirectory")
|
||||
set(CMAKE_RELEASE_DIRECTORY "c:/msys64/home/dashboard/CMakeReleaseDirectory")
|
||||
set(CONFIGURE_WITH_CMAKE TRUE)
|
||||
set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake/bin/cmake.exe")
|
||||
set(PROCESSORS 8)
|
||||
set(HOST dash2win64)
|
||||
set(CPACK_BINARY_GENERATORS "NSIS ZIP")
|
||||
set(HOST dash3win7)
|
||||
set(RUN_LAUNCHER ~/rel/run)
|
||||
set(CPACK_BINARY_GENERATORS "WIX ZIP")
|
||||
set(CPACK_SOURCE_GENERATORS "ZIP")
|
||||
set(MAKE_PROGRAM "make")
|
||||
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=Unix Makefiles
|
||||
CMAKE_GENERATOR:INTERNAL=Ninja
|
||||
BUILD_QtDialog:BOOL:=TRUE
|
||||
CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE
|
||||
CMake_INSTALL_DEPENDENCIES:BOOL=ON
|
||||
QT_QMAKE_EXECUTABLE:FILEPATH=c:/Dashboards/Support/qt-build/Qt/bin/qmake.exe
|
||||
")
|
||||
set(ENV ". ~/rel/env")
|
||||
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||
set(GIT_EXTRA "git config core.autocrlf true")
|
||||
include(${path}/release_cmake.cmake)
|
Loading…
Reference in New Issue