diff options
| -rw-r--r-- | Tests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Utilities/Release/create-cmake-release.cmake | 4 | ||||
| -rw-r--r-- | Utilities/Release/win32_release.cmake | 53 | ||||
| -rw-r--r-- | Utilities/Release/win64_release.cmake | 53 |
4 files changed, 0 insertions, 115 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 32e6582..0c8a639 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -790,13 +790,8 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH endif() endmacro() if(CMake_BUILD_NIGHTLY_RELEASES) - ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin32 - win32_release.cmake) - ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin64 - win64_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX osx_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 17a2151..88ac826 100644 --- a/Utilities/Release/create-cmake-release.cmake +++ b/Utilities/Release/create-cmake-release.cmake @@ -46,13 +46,9 @@ endfunction() write_docs_shell_script("create-${CMAKE_CREATE_VERSION}-docs.sh") write_rel_shell_script("create-${CMAKE_CREATE_VERSION}-macos.sh" osx_release ) # macOS x86_64 -write_rel_shell_script("create-${CMAKE_CREATE_VERSION}-win64.sh" win64_release ) # Windows x64 -write_rel_shell_script("create-${CMAKE_CREATE_VERSION}-win32.sh" win32_release ) # Windows x86 message("Build docs first and then build for each platform: ./create-${CMAKE_CREATE_VERSION}-docs.sh && ./create-${CMAKE_CREATE_VERSION}-macos.sh && - ./create-${CMAKE_CREATE_VERSION}-win64.sh && - ./create-${CMAKE_CREATE_VERSION}-win32.sh && echo done ") diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake deleted file mode 100644 index 993db6e..0000000 --- a/Utilities/Release/win32_release.cmake +++ /dev/null @@ -1,53 +0,0 @@ -set(CMAKE_RELEASE_DIRECTORY "c:/msys64/home/dashboard/CMakeReleaseDirectory32") -set(CONFIGURE_WITH_CMAKE TRUE) -set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files/CMake/bin/cmake.exe") -set(PROCESSORS 16) -set(HOST win32) -set(RUN_LAUNCHER ~/rel/run) -set(CPACK_BINARY_GENERATORS "WIX ZIP") -set(CPACK_SOURCE_GENERATORS "") -set(MAKE_PROGRAM "ninja") -set(MAKE "${MAKE_PROGRAM} -j16") -set(qt_prefix "c:/Qt/5.12.1/msvc2017-32-w7-mt") -set(qt_win_libs - ${qt_prefix}/plugins/platforms/qwindows.lib - ${qt_prefix}/plugins/styles/qwindowsvistastyle.lib - ${qt_prefix}/lib/Qt5EventDispatcherSupport.lib - ${qt_prefix}/lib/Qt5FontDatabaseSupport.lib - ${qt_prefix}/lib/Qt5ThemeSupport.lib - ${qt_prefix}/lib/qtfreetype.lib - ${qt_prefix}/lib/qtlibpng.lib - imm32.lib - wtsapi32.lib - ) -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:STRING=3 -CMAKE_MSVC_RUNTIME_LIBRARY:STRING=MultiThreaded$<$<CONFIG:Debug>:Debug> -CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x86 -subsystem:console,6.01 -CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES:STRING=${qt_win_libs} -CMAKE_PREFIX_PATH:STRING=${qt_prefix} -CMake_TEST_Qt4:BOOL=OFF -CMake_TEST_Qt5:BOOL=OFF -PYTHON_EXECUTABLE:FILEPATH=C:/Python/3.8-64/python.exe -") -set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000") -set(CFLAGS "${ppflags}") -set(CXXFLAGS "${ppflags}") -set(ENV ". ~/rel/env32") -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 'ConsoleBuf|Module.ExternalData'") - set(SIGN "") -else() - string(APPEND INITIAL_CACHE "CMake_INSTALL_SIGNTOOL:STRING=signtool\n") - set(SIGN [[signtool sign -v -a -tr http://timestamp.digicert.com -fd sha256 -td sha256 -d "CMake Windows Installer" cmake-*.msi]]) -endif() -include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake deleted file mode 100644 index 3042889..0000000 --- a/Utilities/Release/win64_release.cmake +++ /dev/null @@ -1,53 +0,0 @@ -set(CMAKE_RELEASE_DIRECTORY "c:/msys64/home/dashboard/CMakeReleaseDirectory64") -set(CONFIGURE_WITH_CMAKE TRUE) -set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files/CMake/bin/cmake.exe") -set(PROCESSORS 16) -set(HOST win64) -set(RUN_LAUNCHER ~/rel/run) -set(CPACK_BINARY_GENERATORS "WIX ZIP") -set(CPACK_SOURCE_GENERATORS "") -set(MAKE_PROGRAM "ninja") -set(MAKE "${MAKE_PROGRAM} -j16") -set(qt_prefix "c:/Qt/5.12.1/msvc2017-64-w7-mt") -set(qt_win_libs - ${qt_prefix}/plugins/platforms/qwindows.lib - ${qt_prefix}/plugins/styles/qwindowsvistastyle.lib - ${qt_prefix}/lib/Qt5EventDispatcherSupport.lib - ${qt_prefix}/lib/Qt5FontDatabaseSupport.lib - ${qt_prefix}/lib/Qt5ThemeSupport.lib - ${qt_prefix}/lib/qtfreetype.lib - ${qt_prefix}/lib/qtlibpng.lib - imm32.lib - wtsapi32.lib - ) -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:STRING=3 -CMAKE_MSVC_RUNTIME_LIBRARY:STRING=MultiThreaded$<$<CONFIG:Debug>:Debug> -CMAKE_EXE_LINKER_FLAGS:STRING=-machine:x64 -subsystem:console,6.01 -CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES:STRING=${qt_win_libs} -CMAKE_PREFIX_PATH:STRING=${qt_prefix} -CMake_TEST_Qt4:BOOL=OFF -CMake_TEST_Qt5:BOOL=OFF -PYTHON_EXECUTABLE:FILEPATH=C:/Python/3.8-64/python.exe -") -set(ppflags "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000") -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") -if(CMAKE_CREATE_VERSION STREQUAL "nightly") - # Some tests fail spuriously too often. - set(EXTRA_CTEST_ARGS "-E 'ConsoleBuf|Module.ExternalData'") - set(SIGN "") -else() - string(APPEND INITIAL_CACHE "CMake_INSTALL_SIGNTOOL:STRING=signtool\n") - set(SIGN [[signtool sign -v -a -tr http://timestamp.digicert.com -fd sha256 -td sha256 -d "CMake Windows Installer" cmake-*.msi]]) -endif() -include(${path}/release_cmake.cmake) |