Finally fix all github actions builds

mmp · Nov 25, 2024 · 3976fd7 · 3976fd7
1 parent 9d60a9c
commit 3976fd7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/.github/workflows/ci-cpu-windows.yml b/.github/workflows/ci-cpu-windows.yml
@@ -36,10 +36,16 @@ jobs:
     - name: Get cmake
       uses: lukka/get-cmake@latest
 
+    - name: Install pkgconfig and zlib
+      run: |
+        choco install pkgconfiglite
+        vcpkg install zlib:x64-windows
+        vcpkg install zlib:x64-windows-static
+
     - name: Configure
       run: |
         cd build
-        cmake .. -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True ${{ matrix.config }}
+        cmake .. -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT"/scripts/buildsystems/vcpkg.cmake -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True ${{ matrix.config }}
       
     - name: Build
       run: cmake --build build --parallel --config Release

diff --git a/.github/workflows/ci-gpu.yml b/.github/workflows/ci-gpu.yml
@@ -68,11 +68,25 @@ jobs:
     - name: Get cmake
       uses: lukka/get-cmake@latest
 
+    - name: Install pkgconfig and zlib
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+        choco install pkgconfiglite
+        vcpkg install zlib:x64-windows
+        vcpkg install zlib:x64-windows-static
+
     - name: Install OpenGL
-      if: ${{ matrix.os == 'ubuntu-22.04' }}
+      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

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,7 +65,7 @@ endfunction ()
 
 check_ext ("OpenEXR" "openexr/OpenEXR" ca757f97033ae7cfcc6130f23c0e9ee86b108b07)
 check_ext ("OpenVDB" "openvdb/nanovdb" 414bed84c2fc22e188eac7b611aa85c7edd7a5a9)
-check_ext ("Ptex" "ptex/src" ba306d31270162649585123d48c827bd6309051f)
+check_ext ("Ptex" "ptex/src" 054047d02b9e06e690420b407114d2872435b953)
 check_ext ("double-conversion" "double-conversion/cmake" cc1f75a114aca8d2af69f73a5a959aecbab0e87a)
 check_ext ("filesystem" "filesystem/filesystem" c5f9de30142453eb3c6fe991e82dfc2583373116)
 check_ext ("glfw" "glfw/docs" 7b6aead9fb88b3623e3b3725ebb42670cbe4c579)

diff --git a/src/ext/ptex b/src/ext/ptex
diff --git a/src/pbrt/textures.cpp b/src/pbrt/textures.cpp
@@ -23,6 +23,11 @@
 
 #include <Ptexture.h>
 
+// Windows strikes again.
+#ifdef RGB
+#undef RGB
+#endif
+
 namespace pbrt {
 
 std::string TextureEvalContext::ToString() const {
+15 −23		CMakeLists.txt
+2 −0		Ptex.spec.in
+23 −1		src/build/CMakeLists.txt
+1 −3		src/build/ptex-config.cmake
+21 −0		src/build/ptex.pc.in
+0 −23		src/doc/Doxyfile
+0 −23		src/doc/Doxyfile_API_only
+2 −2		src/ptex/CMakeLists.txt
+17 −0		src/ptex/PtexInt.h
+3 −1		src/ptex/PtexPlatform.h
+8 −0		src/ptex/PtexReader.cpp
+1 −1		src/ptex/PtexReader.h
+4 −0		src/ptex/PtexWriter.cpp
+3 −0		src/tests/CMakeLists.txt
+1 −1		src/utils/CMakeLists.txt