From 4b0d0eb755079e09756f98fa80e974f716f8cd70 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Wed, 11 Sep 2024 09:20:57 +0800 Subject: [PATCH 1/3] Fix issue that github action windows build could not find win10sdk (SoftFever/OrcaSlicer#6724) --- .github/workflows/build_orca.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index c44b4b010bc..7d534036eef 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -159,6 +159,9 @@ jobs: - name: Build slicer Win if: inputs.os == 'windows-latest' working-directory: ${{ github.workspace }} + env: + WindowsSdkDir: 'C:/Program Files (x86)/Windows Kits/10/' + WindowsSDKVersion: '10.0.22000.0' run: .\build_release_vs2022.bat slicer - name: Create installer Win From 735c647c7c5cdec2d2763003a2f8c1d35ea81a63 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Wed, 11 Sep 2024 09:35:32 +0800 Subject: [PATCH 2/3] Another attempt to fix the build issue --- .github/workflows/build_orca.yml | 4 ++-- build_release_vs2022.bat | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 7d534036eef..ae855633d76 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -160,8 +160,8 @@ jobs: if: inputs.os == 'windows-latest' working-directory: ${{ github.workspace }} env: - WindowsSdkDir: 'C:/Program Files (x86)/Windows Kits/10/' - WindowsSDKVersion: '10.0.22000.0' + WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\' + WindowsSDKVersion: '10.0.22000.0\' run: .\build_release_vs2022.bat slicer - name: Create installer Win diff --git a/build_release_vs2022.bat b/build_release_vs2022.bat index 76e8c14f0c2..589a144a338 100644 --- a/build_release_vs2022.bat +++ b/build_release_vs2022.bat @@ -58,7 +58,7 @@ mkdir %build_dir% cd %build_dir% echo on -cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="%WindowsSdkDir%Include\%WindowsSDKVersion%\" +cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="%WindowsSdkDir%Include\%WindowsSDKVersion%" cmake --build . --config %build_type% --target ALL_BUILD -- -m @echo off cd .. From df8201de1a4319b10ff9d01a92ce415770a2132b Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Wed, 11 Sep 2024 09:53:42 +0800 Subject: [PATCH 3/3] This should work now --- build_release_vs2022.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_release_vs2022.bat b/build_release_vs2022.bat index 589a144a338..76e8c14f0c2 100644 --- a/build_release_vs2022.bat +++ b/build_release_vs2022.bat @@ -58,7 +58,7 @@ mkdir %build_dir% cd %build_dir% echo on -cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="%WindowsSdkDir%Include\%WindowsSDKVersion%" +cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="%WindowsSdkDir%Include\%WindowsSDKVersion%\" cmake --build . --config %build_type% --target ALL_BUILD -- -m @echo off cd ..