mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-08 16:19:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ci-package-windows-10'

Browse Source 
0a0bdaecdf ci: Update Windows packaging jobs to VS 20206
d54e15a5b8 ci: Require Windows 10 in official precompiled binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11496
This commit is contained in:
Brad King
2025-12-11 14:49:49 +00:00
committed by Kitware Robot
parent 6d9c316515 0a0bdaecdf
commit c570431115
6 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -1636,7 +1636,7 @@ b:windows-x86_64-package:
- .windows_x86_64_package
- .cmake_build_windows
- .cmake_build_package_artifacts
- .windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44
- .windows_x86_64_tags_nonconcurrent_vs2026
- .run_only_for_package
needs:
- p:doc-package
@@ -1667,7 +1667,7 @@ b:windows-i386-package:
- .windows_i386_package
- .cmake_build_windows
- .cmake_build_package_artifacts
- .windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44
- .windows_x86_64_tags_nonconcurrent_vs2026
- .run_only_for_package
needs:
- p:doc-package

2
.gitlab/ci/configure_windows_arm64_package.cmake
View File

@@ -4,7 +4,7 @@ set(CPACK_SYSTEM_NAME "windows-arm64" CACHE STRING "")
# Tell WiX to package for this architecture.
set(CPACK_WIX_ARCHITECTURE "arm64" CACHE STRING "")
# Use APIs from at most Windows 7
# Use APIs from at most Windows 10
set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000008" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000008" CACHE STRING "")
set(CMAKE_EXE_LINKER_FLAGS "-machine:arm64 -subsystem:console,6.02" CACHE STRING "")

8
.gitlab/ci/configure_windows_i386_package.cmake
View File

@@ -4,10 +4,10 @@ set(CPACK_SYSTEM_NAME "windows-i386" CACHE STRING "")
# Tell WiX to package for this architecture.
set(CPACK_WIX_ARCHITECTURE "x86" CACHE STRING "")
# Use APIs from at most Windows 7
set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "")
set(CMAKE_EXE_LINKER_FLAGS "-machine:x86 -subsystem:console,6.01" CACHE STRING "")
# Use APIs from at most Windows 10
set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000000" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000000" CACHE STRING "")
set(CMAKE_EXE_LINKER_FLAGS "-machine:x86 -subsystem:console,6.02" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_package_common_x86.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_package_common.cmake")

8
.gitlab/ci/configure_windows_x86_64_package.cmake
View File

@@ -4,10 +4,10 @@ set(CPACK_SYSTEM_NAME "windows-x86_64" CACHE STRING "")
# Tell WiX to package for this architecture.
set(CPACK_WIX_ARCHITECTURE "x64" CACHE STRING "")
# Use APIs from at most Windows 7
set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x601 -DNTDDI_VERSION=0x06010000" CACHE STRING "")
set(CMAKE_EXE_LINKER_FLAGS "-machine:x64 -subsystem:console,6.01" CACHE STRING "")
# Use APIs from at most Windows 10
set(CMAKE_C_FLAGS "-D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000000" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-GR -EHsc -D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000000" CACHE STRING "")
set(CMAKE_EXE_LINKER_FLAGS "-machine:x64 -subsystem:console,6.02" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_package_common_x86.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_package_common.cmake")

19
.gitlab/os-windows.yml
View File

@@ -43,12 +43,6 @@
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.44.35207"
.windows_vcvarsall_vs2022_x86_msvc14.44:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x86"
VCVARSVERSION: "14.44.35207"
.windows_vcvarsall_vs2026_x64:
variables:
VCVARSALL: "${VS180COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
@@ -107,7 +101,7 @@
.windows_x86_64_package:
extends:
- .windows_package
- .windows_vcvarsall_vs2022_x64_msvc14.44
- .windows_vcvarsall_vs2026_x64
variables:
CMAKE_CONFIGURATION: windows_x86_64_package
@@ -115,7 +109,7 @@
.windows_i386_package:
extends:
- .windows_package
- .windows_vcvarsall_vs2022_x86_msvc14.44
- .windows_vcvarsall_vs2026_x86
variables:
CMAKE_CONFIGURATION: windows_i386_package
@@ -409,15 +403,6 @@
- msvc-14.50
- concurrent
.windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44:
tags:
- cmake # Since this is a bare runner, pin to a project.
- windows-x86_64
- shell
- vs2022
- msvc-14.44
- nonconcurrent
.windows_x86_64_tags_concurrent_vs2022_msvc14.44:
tags:
- cmake # Since this is a bare runner, pin to a project.

5
Help/release/dev/ci-package-windows-10.rst Normal file
View File

@@ -0,0 +1,5 @@
ci-package-windows-10
---------------------
* The precompiled Windows binaries provided on
`cmake.org <https://cmake.org/download/>`_ now require Windows 10 or higher.