Skip to content

Commit 576a144

Browse files
Squashed commit of the following:
commit 87f7f8c Author: Ocraftyone <[email protected]> Date: Tue Oct 21 13:13:34 2025 -0400 Install the latest CMake version commit a5e261a Author: Rodrigo <[email protected]> Date: Tue Oct 21 13:06:35 2025 -0400 CMake 4.x. windows (SoftFever#10820) commit c67582f Author: Ocraftyone <[email protected]> Date: Mon Oct 20 22:11:58 2025 -0400 Fix install prefix commit d6538f6 Merge: 007e1ca 0e30dab Author: Ocraftyone <[email protected]> Date: Mon Oct 20 20:40:34 2025 -0400 Merge branch 'main' into update-windows-buildscript commit 007e1ca Author: Ocraftyone <[email protected]> Date: Sat Oct 18 20:56:41 2025 -0400 Update workflows commit 296303d Author: Ocraftyone <[email protected]> Date: Fri Oct 17 20:20:24 2025 -0400 Add check for cmake commit b13bd9a Author: Ocraftyone <[email protected]> Date: Fri Oct 17 20:16:05 2025 -0400 Add --force to Visual Studio install Always run the VS installer to ensure all components are installed and up to date commit ad73661 Author: Ocraftyone <[email protected]> Date: Fri Oct 17 11:53:15 2025 -0400 Add the option to install the full Visual Studio IDE commit 784a55c Author: Ocraftyone <[email protected]> Date: Fri Oct 17 11:47:50 2025 -0400 Handle installing vs2019 commit de8642e Author: Ocraftyone <[email protected]> Date: Fri Oct 17 11:35:58 2025 -0400 Merge vs2019 and vs2022 build scripts commit 707947a Author: Ocraftyone <[email protected]> Date: Thu Oct 16 18:19:47 2025 -0400 Add padding between flags and help description commit 4244fc1 Author: Ocraftyone <[email protected]> Date: Thu Oct 16 11:41:56 2025 -0400 Print help on unknown argument commit c9eef43 Author: Ocraftyone <[email protected]> Date: Wed Oct 15 20:54:46 2025 -0400 Print help if args are empty commit c2ece76 Author: Ocraftyone <[email protected]> Date: Wed Oct 15 20:52:29 2025 -0400 Organize argument definitions commit c05ad09 Author: Ocraftyone <[email protected]> Date: Wed Oct 15 20:51:27 2025 -0400 Add help message commit e618682 Author: Ocraftyone <[email protected]> Date: Wed Oct 15 20:21:32 2025 -0400 Add install deps via winget commit fd43628 Author: Ocraftyone <[email protected]> Date: Tue Oct 14 08:51:49 2025 -0400 Add clean arg commit de0c7e0 Author: Ocraftyone <[email protected]> Date: Tue Oct 14 07:14:45 2025 -0400 Move handle_args to a function commit 849d93d Author: Ocraftyone <[email protected]> Date: Thu Oct 9 10:55:29 2025 -0400 Echo all variables in script debug mode commit 93076e7 Author: Ocraftyone <[email protected]> Date: Thu Oct 9 10:54:54 2025 -0400 Add print_and_run commit b6568bf Author: Ocraftyone <[email protected]> Date: Wed Oct 8 10:25:58 2025 -0400 Exit script upon failed cmake command commit aee958e Author: Ocraftyone <[email protected]> Date: Wed Oct 8 10:22:42 2025 -0400 Improve script layout - Use if statements instead of goto statements - Move pack deps to after build deps to allow chaining the commands - Pass paths to cmake instead of using mkdir/cd commit fbd24c9 Author: Ocraftyone <[email protected]> Date: Wed Oct 8 02:59:36 2025 -0400 Add argument parsing
1 parent 34e49a4 commit 576a144

File tree

7 files changed

+481
-128
lines changed

7 files changed

+481
-128
lines changed

.github/workflows/build_all.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
- 'version.inc'
2727
- ".github/workflows/build_*.yml"
2828
- 'build_linux.sh'
29-
- 'build_release_vs2022.bat'
29+
- 'build_win.bat'
3030
- 'build_release_macos.sh'
3131
- 'scripts/flatpak/**'
3232

.github/workflows/build_deps.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ jobs:
6969
working-directory: ${{ github.workspace }}
7070
run: |
7171
choco install strawberryperl
72-
.\build_release_vs2022.bat deps
73-
.\build_release_vs2022.bat pack
72+
.\build_win.bat -dp
7473
cd ${{ github.workspace }}/deps/build
7574
7675
- name: Build on Mac ${{ inputs.arch }}

.github/workflows/build_orca.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ jobs:
233233
env:
234234
WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\'
235235
WindowsSDKVersion: '10.0.26100.0\'
236-
run: .\build_release_vs2022.bat slicer
236+
run: .\build_win.bat -s
237237

238238
- name: Create installer Win
239239
if: inputs.os == 'windows-latest'

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cmake_minimum_required(VERSION 3.13)
22

3-
# Verify that your CMake version is exactly 3.31.x series or lower on windows
4-
if ( ((MSVC) OR (WIN32)) AND (${CMAKE_VERSION} VERSION_GREATER_EQUAL "4.0") )
5-
message(FATAL_ERROR "Only cmake versions between 3.13.x and 3.31.x is supported on windows. Detected version: ${CMAKE_VERSION}")
3+
# Verify that your CMake version is exactly 3.5 series or higher on windows
4+
if ( (MSVC OR WIN32) AND (${CMAKE_VERSION} VERSION_LESS "3.5") )
5+
message(FATAL_ERROR "CMake current version ${CMAKE_VERSION} is too old. Minimum required is 3.5.")
66
endif()
77

88
if (WIN32)

build_release.bat

Lines changed: 0 additions & 52 deletions
This file was deleted.

build_release_vs2022.bat

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)