Skip to content

Commit d126cc2

Browse files
Hope to get it working
1 parent 4753119 commit d126cc2

2 files changed

Lines changed: 6 additions & 15 deletions

File tree

.github/workflows/main.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,17 @@ jobs:
6868
cp -r oidn_temp/* thirdparty/oidn/ 2>/dev/null || true
6969
fi
7070
71-
- name: Setup vcpkg
72-
if: runner.os == 'Windows'
73-
uses: lukka/run-vcpkg@v11
74-
7571
- name: Install dependencies (Windows)
7672
if: runner.os == 'Windows'
7773
shell: powershell
7874
run: |
79-
# Install Embree via vcpkg (OIDN not available in vcpkg, keep manual install)
80-
& vcpkg\vcpkg.exe install embree:x64-windows
81-
82-
# Set environment variables for CMake
83-
echo "EMBREE_LOCATION=$env:VCPKG_ROOT/installed/x64-windows" | Out-File -FilePath $env:GITHUB_ENV -Append
75+
# Download and extract Embree (simplified approach)
76+
Invoke-WebRequest -Uri "${{ matrix.embree_url }}" -OutFile "embree.zip"
77+
Expand-Archive -Path "embree.zip" -DestinationPath "." -Force
78+
# Set EMBREE_LOCATION to the extracted directory
79+
echo "EMBREE_LOCATION=$PWD/${{ matrix.embree_dir }}" | Out-File -FilePath $env:GITHUB_ENV -Append
8480
85-
# Install OIDN manually (simplified approach)
81+
# Download and extract OIDN
8682
Invoke-WebRequest -Uri "https://github.com/RenderKit/oidn/releases/download/v2.3.3/oidn-2.3.3.x64.windows.zip" -OutFile "oidn.zip"
8783
Expand-Archive -Path "oidn.zip" -DestinationPath "thirdparty/oidn" -Force
8884

CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ cmake_policy(SET CMP0091 NEW)
66
cmake_policy(SET CMP0056 NEW)
77
cmake_policy(SET CMP0066 NEW)
88

9-
# Setup vcpkg toolchain if available
10-
if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
11-
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
12-
endif()
13-
149
project(etx-tracer VERSION 0.0.1)
1510

1611
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

0 commit comments

Comments
 (0)