Better GitHub

Author: serhii-rieznik

.github/workflows/main.yml

@@ -68,59 +68,25 @@ jobs:
             cp -r oidn_temp/* thirdparty/oidn/ 2>/dev/null || true
           fi
 
+      - name: Setup vcpkg
+        if: runner.os == 'Windows'
+        uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgGitCommitId: '3e8ae4add5a6ac3b3b9f8c9d1'
+
       - name: Install dependencies (Windows)
         if: runner.os == 'Windows'
         shell: powershell
         run: |
-          # Download and extract Embree
-          Invoke-WebRequest -Uri "${{ matrix.embree_url }}" -OutFile "embree.zip"
-          Expand-Archive -Path "embree.zip" -DestinationPath "."
-          $expectedEmbreeDir = "${{ matrix.embree_dir }}"
+          # Install Embree via vcpkg (OIDN not available in vcpkg, keep manual install)
+          & vcpkg\vcpkg.exe install embree:x64-windows
 
-          # Clean existing Embree installation
-          if (Test-Path "thirdparty/embree") {
-            Remove-Item -Path "thirdparty/embree" -Recurse -Force
-          }
+          # Set environment variables for CMake
+          echo "EMBREE_LOCATION=$env:VCPKG_ROOT/installed/x64-windows" | Out-File -FilePath $env:GITHUB_ENV -Append
 
-          # Handle different extraction structures
-          if (Test-Path $expectedEmbreeDir) {
-            # Expected directory exists, move it
-            Move-Item -Path $expectedEmbreeDir -Destination "thirdparty/embree" -Force
-          } else {
-            # Check if embree files were extracted directly
-            $embreeFiles = Get-ChildItem -Path "." -Directory | Where-Object { $_.Name -like "*embree*" }
-            if ($embreeFiles) {
-              Move-Item -Path $embreeFiles[0].FullName -Destination "thirdparty/embree" -Force
-            } else {
-              Write-Host "Warning: Could not find extracted Embree directory. Creating empty thirdparty/embree"
-              New-Item -ItemType Directory -Path "thirdparty/embree" -Force | Out-Null
-            }
-          }
-
-          # Add to PATH and set EMBREE_LOCATION
-          echo "$PWD/thirdparty/embree/bin" | Out-File -FilePath $env:GITHUB_PATH -Append
-          echo "EMBREE_LOCATION=$PWD/thirdparty/embree" | Out-File -FilePath $env:GITHUB_ENV -Append
-
-          # Download and extract OIDN for Windows (v2.3.3 from RenderKit)
+          # Install OIDN manually (simplified approach)
           Invoke-WebRequest -Uri "https://github.com/RenderKit/oidn/releases/download/v2.3.3/oidn-2.3.3.x64.windows.zip" -OutFile "oidn.zip"
-          Expand-Archive -Path "oidn.zip" -DestinationPath "."
-          Get-ChildItem -Path "." -Name
-          # Clean existing OIDN installation
-          if (Test-Path "thirdparty/oidn") {
-            Remove-Item -Path "thirdparty/oidn" -Recurse -Force
-          }
-          # Move extracted OIDN directory to thirdparty
-          if (Test-Path "oidn-2.3.3.x64.windows") {
-            Move-Item -Path "oidn-2.3.3.x64.windows" -Destination "thirdparty/oidn" -Force
-          } else {
-            # Handle different extraction structures
-            $extractedDirs = Get-ChildItem -Path "." -Directory | Where-Object { $_.Name -notlike "*embree*" -and $_.Name -like "*oidn*" }
-            if ($extractedDirs) {
-              Move-Item -Path $extractedDirs[0].FullName -Destination "thirdparty/oidn" -Force
-            } else {
-              Write-Host "Warning: Could not find extracted OIDN directory"
-            }
-          }
+          Expand-Archive -Path "oidn.zip" -DestinationPath "thirdparty/oidn" -Force
 
       - name: Verify OIDN installation
         if: runner.os == 'Windows'

CMakeLists.txt

@@ -6,6 +6,11 @@ cmake_policy(SET CMP0091 NEW)
 cmake_policy(SET CMP0056 NEW)
 cmake_policy(SET CMP0066 NEW)
 
+# Setup vcpkg toolchain if available
+if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+  set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
+endif()
+
 project(etx-tracer VERSION 0.0.1)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)