Version 5.3.1, built against (no longer embedded) zlib 1.3.1.

mosra · Jan 31, 2024 · dcac6a5 · dcac6a5
1 parent 433ff2d
commit dcac6a5
Showing 1 changed file with 37 additions and 10 deletions.
diff --git a/.github/workflows/assimp.yml b/.github/workflows/assimp.yml
@@ -9,7 +9,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  ASSIMP_VERSION: 5.2.5
+  ZLIB_VERSION: 1.3.1
+  ASSIMP_VERSION: 5.3.1
 
 jobs:
   windows:
@@ -29,10 +30,14 @@ jobs:
         repository: assimp/assimp
         ref: v${{ env.ASSIMP_VERSION }}
         path: assimp
+    - name: Download prebuilt zlib
+      # Built on the `zlib` branch but hosted manually to avoid having to mess
+      # with access permissions
+      run: |
+        Invoke-WebRequest https://ci.magnum.graphics/zlib-${{ env.ZLIB_VERSION }}-${{ matrix.os }}.zip -OutFile zlib.zip
+        7z x zlib.zip -o${{ github.workspace }}/deps
     - name: Build & install Debug
       shell: cmd
-      # -S and -B is only since CMake 3.13, Windows 2016 uses 3.12 even though
-      # the README says 3.19.1
       run: |
         mkdir build-debug && cd build-debug
         cmake ../assimp ^
@@ -41,15 +46,18 @@ jobs:
           -DCMAKE_BUILD_TYPE=Debug ^
           -DASSIMP_BUILD_ASSIMP_TOOLS=OFF ^
           -DASSIMP_BUILD_TESTS=OFF ^
+          -DASSIMP_BUILD_ZLIB=OFF ^
           -DASSIMP_NO_EXPORT=ON ^
           -DBUILD_SHARED_LIBS=OFF ^
+          -DZLIB_INCLUDE_DIR=${{ github.workspace }}/deps/include ^
+          -DZLIB_LIBRARY_REL=${{ github.workspace }}/deps/lib/zlibstatic.lib ^
+          -DZLIB_LIBRARY_DBG=${{ github.workspace }}/deps/lib/zlibstatic.lib ^
           -DCMAKE_INSTALL_PREFIX=%CD:\=/%/../install-debug ^
+          -DCMAKE_PREFIX_PATH=%CD:\=/%/deps ^
           -G Ninja
         ninja install
     - name: Build & install Release
       shell: cmd
-      # -S and -B is only since CMake 3.13, Windows 2016 uses 3.12 even though
-      # the README says 3.19.1
       run: |
         mkdir build && cd build
         cmake ../assimp ^
@@ -58,9 +66,14 @@ jobs:
           -DCMAKE_BUILD_TYPE=Release ^
           -DASSIMP_BUILD_ASSIMP_TOOLS=OFF ^
           -DASSIMP_BUILD_TESTS=OFF ^
+          -DASSIMP_BUILD_ZLIB=OFF ^
           -DASSIMP_NO_EXPORT=ON ^
           -DBUILD_SHARED_LIBS=OFF ^
+          -DZLIB_INCLUDE_DIR=${{ github.workspace }}/deps/include ^
+          -DZLIB_LIBRARY_REL=${{ github.workspace }}/deps/lib/zlibstatic.lib ^
+          -DZLIB_LIBRARY_DBG=${{ github.workspace }}/deps/lib/zlibstatic.lib ^
           -DCMAKE_INSTALL_PREFIX=%CD:\=/%/../install ^
+          -DCMAKE_PREFIX_PATH=%CD:\=/%/deps ^
           -G Ninja
         ninja install
     - name: Upload Debug artifacts
@@ -88,10 +101,14 @@ jobs:
         repository: assimp/assimp
         ref: v${{ env.ASSIMP_VERSION }}
         path: assimp
+    - name: Download prebuilt zlib
+      # Built on the `zlib` branch but hosted manually to avoid having to mess
+      # with access permissions
+      run: |
+        Invoke-WebRequest https://ci.magnum.graphics/zlib-${{ env.ZLIB_VERSION }}-windows-mingw.zip -OutFile zlib.zip
+        7z x zlib.zip -o${{ github.workspace }}/deps
     - name: Build & install
       shell: cmd
-      # Build an embedded zlib because otherwise it finds it somewhere on the
-      # system, which is undesirable
       run: |
         mkdir build && cd build
         cmake ../assimp ^
@@ -100,10 +117,14 @@ jobs:
           -DCMAKE_BUILD_TYPE=Release ^
           -DASSIMP_BUILD_ASSIMP_TOOLS=OFF ^
           -DASSIMP_BUILD_TESTS=OFF ^
-          -DASSIMP_BUILD_ZLIB=ON ^
+          -DASSIMP_BUILD_ZLIB=OFF ^
           -DASSIMP_NO_EXPORT=ON ^
           -DBUILD_SHARED_LIBS=OFF ^
+          -DZLIB_INCLUDE_DIR=${{ github.workspace }}/deps/include ^
+          -DZLIB_LIBRARY_REL=${{ github.workspace }}/deps/lib/libzlibstatic.a ^
+          -DZLIB_LIBRARY_DBG=${{ github.workspace }}/deps/lib/libzlibstatic.a ^
           -DCMAKE_INSTALL_PREFIX=%CD:\=/%/../install ^
+          -DCMAKE_PREFIX_PATH=%CD:\=/%/deps ^
           -G Ninja
         ninja install
     - name: Upload artifacts
@@ -126,25 +147,31 @@ jobs:
     - name: Install base build tools
       run: |
         apt update
-        apt install -y ninja-build cmake g++
+        apt install -y ninja-build cmake g++ wget
         mkdir -p deps
     - name: Clone Assimp
       uses: actions/checkout@v3
       with:
         repository: assimp/assimp
         ref: v${{ env.ASSIMP_VERSION }}
         path: assimp
+    - name: Fetch prebuilt zlib
+      run: |
+        mkdir -p deps && cd deps
+        wget https://ci.magnum.graphics/zlib-${{ env.ZLIB_VERSION }}-${{ matrix.os }}.zip
+        unzip zlib-${{ env.ZLIB_VERSION }}-${{ matrix.os }}.zip
     - name: Build & install
       run: |
         mkdir assimp-build && cd assimp-build
         cmake ../assimp \
           -DCMAKE_BUILD_TYPE=Release \
           -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \
           -DASSIMP_BUILD_TESTS=OFF \
-          -DASSIMP_BUILD_ZLIB=ON \
+          -DASSIMP_BUILD_ZLIB=OFF \
           -DASSIMP_NO_EXPORT=ON \
           -DBUILD_SHARED_LIBS=OFF \
           -DCMAKE_INSTALL_PREFIX=$(pwd)/../install \
+          -DCMAKE_PREFIX_PATH=$(pwd)/../deps \
           -G Ninja
         ninja install/strip
     - name: Upload artifacts