[Apple] Fix build

We weren't explicitly including `bzip` for RSL, so the `wbz` crate was actually covering our missing dep on MacOS (via the `bz2` crate). So when we switched to the Rust version of `bz2`, we no longer had the duplicate dependency, hence the build broke.

Now, we update `zip` and fix a similar bug with `liblzma` (XZ). (New `zip` dep?) Might need to adjust this on Linux, too.

(These CMake scripts should be refactored considerably)

Author: snailspeed3

.github/workflows/cmake.yml

@@ -139,7 +139,7 @@ jobs:
     - name: CMake -- configure
       shell: bash
       working-directory: ${{github.workspace}}/build
-      run: cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DRust_CARGO_TARGET=aarch64-apple-darwin -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=/opt/homebrew/Cellar/llvm/20.1.6/bin/clang++
+      run: cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DRust_CARGO_TARGET=aarch64-apple-darwin -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=/opt/homebrew/Cellar/llvm/20.1.8/bin/clang++
 
     - name: CMake -- build
       working-directory: ${{github.workspace}}/build

source/cli/CMakeLists.txt

@@ -49,14 +49,16 @@ elseif (APPLE)
 
   set(GLFW_VERSION "3.4")
   set(FREETYPE_VERSION "2.13.3")
+  set(XZ_VERSION "5.8.1")
 
-  SET_TARGET_PROPERTIES(cli PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework Security -framework SystemConfiguration -ldl ${HOMEBREW_CELLAR}/glfw/${GLFW_VERSION}/lib/libglfw.dylib ${HOMEBREW_CELLAR}/freetype/${FREETYPE_VERSION}/lib/libfreetype.dylib")
+  SET_TARGET_PROPERTIES(cli PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework Security -framework SystemConfiguration -ldl ${HOMEBREW_CELLAR}/glfw/${GLFW_VERSION}/lib/libglfw.dylib ${HOMEBREW_CELLAR}/freetype/${FREETYPE_VERSION}/lib/libfreetype.dylib ${HOMEBREW_CELLAR}/xz/${XZ_VERSION}/lib/liblzma.a")
 elseif (UNIX AND NOT EMSCRIPTEN)
   find_library(GLFW3_LIBRARY NAMES libglfw.so PATHS /usr/lib)
   find_library(FREETYPE_LIBRARY NAMES libfreetype.so PATHS /usr/lib)
   find_library(BZIP2_LIBRARY NAMES libbz2.so PATHS /usr/lib)
   find_library(SSL_LIBRARY NAMES libssl.so PATHS /usr/lib)
   find_library(CRYPTO_LIBRARY NAMES libcrypto.so PATHS /usr/lib)
+  # TODO: May need liblzma on linux now
   target_link_libraries(cli PUBLIC
     ${GLFW3_LIBRARY}
     ${FREETYPE_LIBRARY}

source/frontend/CMakeLists.txt

@@ -153,8 +153,9 @@ if (NOT MSVC)
 
     set(GLFW_VERSION "3.4")
     set(FREETYPE_VERSION "2.13.3")
+    set(XZ_VERSION "5.8.1")
 
-    SET_TARGET_PROPERTIES(frontend PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework Security -framework SystemConfiguration -ldl ${HOMEBREW_CELLAR}/glfw/${GLFW_VERSION}/lib/libglfw.dylib ${HOMEBREW_CELLAR}/freetype/${FREETYPE_VERSION}/lib/libfreetype.dylib")
+    SET_TARGET_PROPERTIES(frontend PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework Security -framework SystemConfiguration -ldl ${HOMEBREW_CELLAR}/glfw/${GLFW_VERSION}/lib/libglfw.dylib ${HOMEBREW_CELLAR}/freetype/${FREETYPE_VERSION}/lib/libfreetype.dylib ${HOMEBREW_CELLAR}/xz/${XZ_VERSION}/lib/liblzma.a")
   elseif (UNIX)
     # --start-group, --end-group allows circular dependencies among object files
     if (EMSCRIPTEN)

source/librii/CMakeLists.txt

@@ -199,7 +199,7 @@ elseif (APPLE)
     set(HOMEBREW_CELLAR "/usr/local/Cellar")
   endif()
 
-  set(ASSIMP_VERSION "6.0.1")
+  set(ASSIMP_VERSION "6.0.2")
   target_link_libraries(librii PUBLIC "${HOMEBREW_CELLAR}/assimp/${ASSIMP_VERSION}/lib/libassimp.dylib")
 elseif (EMSCRIPTEN)
   target_link_libraries(librii PUBLIC