maybe

mmp · Nov 25, 2024 · 9c87ddd · 9c87ddd
1 parent dc5f541
commit 9c87ddd
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/.github/workflows/ci-gpu.yml b/.github/workflows/ci-gpu.yml
@@ -73,16 +73,24 @@ jobs:
       run: |
         choco install pkgconfiglite
         vcpkg install zlib:x64-windows
+        vcpkg install zlib:x64-windows-static
 
     - name: Install OpenGL
       if: ${{ matrix.os == 'ubuntu-20.04' }}
       run: sudo apt-get install -y --no-install-recommends libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev libgl1-mesa-dev libwayland-bin libwayland-dev wayland-protocols libxkbcommon-dev libxkbcommon-x11-0
 
-    - name: Configure
+    - name: Configure (Windows)
+      if: ${{ matrix.os == 'windows-latest' }}
       run: |
         cd build
         cmake .. -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT"/scripts/buildsystems/vcpkg.cmake -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX7_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
 
+    - name: Configure (Linux)
+      if: ${{ matrix.os == 'ubuntu-20.04' }}
+      run: |
+        cd build
+        cmake .. -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX7_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
+
     - name: Build
       # We need to limit the number of jobs so that it doesn't OOM 
       run: cmake --build build --parallel 3 --config Release