Update CPMUtil, and fix script

Signed-off-by: crueter <crueter@eden-emu.dev>

.ci/ios/build.sh

@@ -4,36 +4,23 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 WORK_DIR="$PWD"
-export IOS_SDK="$(xcrun --sdk iphoneos --show-sdk-path)"
+xcrun --sdk iphoneos --show-sdk-path
 
-[ ! -z "$IOS_SDK" ]
+# TODO(crueter): FFmpeg for iOS
 
 cmake -G Xcode -B build \
     -DCMAKE_TOOLCHAIN_FILE="$WORK_DIR/.ci/ios/ios-toolchain.cmake" \
     -DPLATFORM=OS64 \
     -DARCHS="arm64" \
     -DDEPLOYMENT_TARGET=16.0 \
-    -DCOCOA_LIBRARY="$IOS_SDK/System/Library/Frameworks/Cocoa.framework" \
-    -DCMAKE_C_COMPILER="$(xcrun --sdk iphoneos clang -arch arm64)" \
-    -DCMAKE_CXX_COMPILER="$(xcrun --sdk iphoneos clang++ -arch arm64)" \
+    -DCMAKE_C_COMPILER="$(xcrun --sdk iphoneos --find clang)" \
+    -DCMAKE_CXX_COMPILER="$(xcrun --sdk iphoneos --find clang++)" \
     -DENABLE_LIBUSB=OFF \
-    -DENABLE_UPDATE_CHECKER=OFF \
     -DENABLE_QT=OFF \
-    -DENABLE_OPENSSL=OFF \
-    -DHTTPLIB_USE_OPENSSL=OFF \
-    -DCPPHTTPLIB_USE_OPENSSL=OFF \
-    -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=OFF \
     -DENABLE_WEB_SERVICE=OFF \
     -DENABLE_CUBEB=OFF \
-    -DYUZU_ROOM=OFF \
-    -DYUZU_ROOM_STANDALONE=OFF \
-    -DYUZU_STATIC_ROOM=OFF \
-    -DYUZU_CMD=OFF \
-    -DUSE_DISCORD_PRESENCE=OFF \
     -DYUZU_USE_EXTERNAL_FFMPEG=ON \
     -DYUZU_USE_EXTERNAL_SDL2=ON \
-    -DCPMUTIL_FORCE_BUNDLED=ON \
-    -DYUZU_USE_BUNDLED_SIRIT=OFF \
     -DCMAKE_BUILD_TYPE=Release
 
 cmake --build build -t eden-ios

CMakeLists.txt

@@ -44,7 +44,7 @@ if (PLATFORM_NETBSD)
     set(ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:${CMAKE_SYSROOT}/usr/pkg/lib/ffmpeg7/pkgconfig")
 endif()
 
-cmake_dependent_option(YUZU_STATIC_ROOM "Build a static room executable only (CI only)" OFF "PLATFORM_LINUX" OFF)
+cmake_dependent_option(YUZU_STATIC_ROOM "Build a static room executable only (CI only)" OFF "PLATFORM_LINUX OR WIN32 OR (APPLE AND NOT IOS)" OFF)
 if (YUZU_STATIC_ROOM)
     set(YUZU_ROOM ON)
     set(YUZU_ROOM_STANDALONE ON)
@@ -72,7 +72,7 @@ endif()
 # qt stuff
 option(ENABLE_QT "Enable the Qt frontend" ON)
 option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
-option(ENABLE_UPDATE_CHECKER "Enable update checker (for Qt and Android)" OFF)
+cmake_dependent_option(ENABLE_UPDATE_CHECKER "Enable update checker (for Qt and Android)" OFF "ENABLE_QT OR ANDROID" OFF)
 cmake_dependent_option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera"  OFF "NOT YUZU_USE_BUNDLED_QT" OFF)
 cmake_dependent_option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF "NOT YUZU_USE_BUNDLED_QT" OFF)
 set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")
@@ -204,7 +204,7 @@ cmake_dependent_option(YUZU_USE_BUNDLED_SDL3 "Download bundled SDL3 build" "${MS
 option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
 
 set(EXT_DEFAULT OFF)
-if (MSVC OR ANDROID)
+if (MSVC OR ANDROID OR IOS)
     set(EXT_DEFAULT ON)
 endif()
 
@@ -214,7 +214,7 @@ cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from external sour
 
 # sirit
 set(BUNDLED_SIRIT_DEFAULT OFF)
-if (((MSVC AND NOT (CMAKE_BUILD_TYPE MATCHES "Deb")) OR ANDROID) AND NOT IOS)
+if ((MSVC AND NOT (CMAKE_BUILD_TYPE MATCHES "Deb")) OR ANDROID)
     set(BUNDLED_SIRIT_DEFAULT ON)
 endif()
 
@@ -246,7 +246,7 @@ option(NIGHTLY_BUILD "Use Nightly qualifiers in the update checker and build met
 cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID AND NOT IOS" OFF)
 cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)
 
-cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "NOT ANDROID" OFF)
+cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "NOT ANDROID AND NOT IOS" OFF)
 
 cmake_dependent_option(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR PLATFORM_LINUX" OFF)