Skip to content

Commit cdb5639

Browse files
committed
Windows release with VC 2022, remove toolset
1 parent ad46a91 commit cdb5639

6 files changed

Lines changed: 9 additions & 13 deletions

File tree

.github/scripts/build.bat

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ cmake --version
1111

1212
cmake -L ^
1313
-G "%~1" ^
14-
-T "%~2" ^
1514
-D CMAKE_INSTALL_LIBDIR=lib ^
1615
-D BUILD_OPENVKL_BENCHMARKS=OFF ^
1716
-D BUILD_OPENVKL_TESTING=ON ^
18-
%~4 %~5 %~6 %~7 %~8 %~9 ^
17+
%~3 %~4 %~5 %~6 %~7 %~8 %~9 ^
1918
../superbuild
2019

21-
cmake --build . --verbose --config "%~3" --target ALL_BUILD -- /m /nologo
20+
cmake --build . --verbose --config "%~2" --target ALL_BUILD -- /m /nologo
2221

2322
:abort
2423
endlocal

.github/scripts/release/windows-test.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ cmake --version
1919

2020
cmake -L `
2121
-G $args[0] `
22-
-T $args[1] `
2322
../examples/from_openvkl_install
2423

2524
cmake --build . --config Release --target ALL_BUILD -- /m /nologo

.github/scripts/release/windows.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ cmake --version
2121

2222
cmake -L `
2323
-G $args[0] `
24-
-T $args[1] `
2524
-D BUILD_DEPENDENCIES_ONLY=ON `
2625
-D CMAKE_INSTALL_PREFIX=$DEP_INSTALL_DIR `
2726
-D CMAKE_INSTALL_LIBDIR=lib `
@@ -44,7 +43,6 @@ $env:glfw3_DIR = $DEP_INSTALL_DIR
4443
# set release settings
4544
cmake -L `
4645
-G $args[0] `
47-
-T $args[1] `
4846
-D CMAKE_PREFIX_PATH="$DEP_INSTALL_DIR\lib\cmake" `
4947
-D CMAKE_INSTALL_PREFIX="$OPENVKL_INSTALL_DIR" `
5048
-D CMAKE_INSTALL_INCLUDEDIR=include `

.github/workflows/internal.ci.windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: '[ "Windows", "build" ]'
2323
artifact-out: build-windows-msvc15
2424
artifact-path: ./build/install
25-
cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "v141" "Release"
25+
cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "Release"
2626

2727
test-windows-msvc15:
2828
needs: build-windows-msvc15
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: '[ "Windows", "build" ]'
4444
artifact-out: build-windows-msvc16
4545
artifact-path: ./build/install
46-
cmd: .github\scripts\build.bat "Visual Studio 16 2019" "v142" "Release"
46+
cmd: .github\scripts\build.bat "Visual Studio 16 2019" "Release"
4747

4848
test-windows-msvc16:
4949
needs: build-windows-msvc16
@@ -65,7 +65,7 @@ jobs:
6565
runs-on: '[ "Windows", "build" ]'
6666
artifact-out: build-windows-msvc17
6767
artifact-path: ./build/install
68-
cmd: .github\scripts\build.bat "Visual Studio 17 2022" "v143" "Release"
68+
cmd: .github\scripts\build.bat "Visual Studio 17 2022" "Release"
6969

7070
test-windows-msvc17:
7171
needs: build-windows-msvc17

.github/workflows/internal.nightly.windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: '[ "Windows", "build" ]'
2424
artifact-out: build-windows-msvc15-debug
2525
artifact-path: ./build/install
26-
cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "v141" "Debug"
26+
cmd: .github\scripts\build.bat "Visual Studio 15 2017 Win64" "Debug"
2727

2828
test-windows-msvc15-debug:
2929
needs: build-windows-msvc15-debug
@@ -33,4 +33,4 @@ jobs:
3333
runs-on: '[ "Windows", "build" ]'
3434
artifact-in: build-windows-msvc15-debug
3535
cmd: |
36-
.github\scripts\run_tests.bat
36+
.github\scripts\run_tests.bat

.github/workflows/internal.release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
cmd: |
8383
$env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2"
8484
$OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2"
85-
.github/scripts/release/windows.ps1 "Visual Studio 15 2017 Win64" "v141"
85+
.github/scripts/release/windows.ps1 "Visual Studio 17 2022"
8686
8787
windows_sycl:
8888
secrets: inherit
@@ -167,7 +167,7 @@ jobs:
167167
cmd: |
168168
$env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2"
169169
$OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2"
170-
.github/scripts/release/windows-test.ps1 "Visual Studio 15 2017 Win64" "v141"
170+
.github/scripts/release/windows-test.ps1 "Visual Studio 17 2022"
171171
172172
windows_sycl-test:
173173
needs: windows_sycl

0 commit comments

Comments
 (0)