From 550a3e40c721ddb6633ebcb76ad0d0343836ed06 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 11 Jun 2024 11:42:24 +0200 Subject: [PATCH] [ci,ios] update defaults --- ci/cmake-preloads/config-ios.txt | 11 ++++++----- ci/cmake-preloads/config-macosx.txt | 1 + libfreerdp/codec/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ci/cmake-preloads/config-ios.txt b/ci/cmake-preloads/config-ios.txt index 687c2b6cf..15b55fbf1 100644 --- a/ci/cmake-preloads/config-ios.txt +++ b/ci/cmake-preloads/config-ios.txt @@ -8,8 +8,9 @@ set (WITH_SANITIZE_ADDRESS ON CACHE BOOL "build with address sanitizer") set (WITH_CLIENT OFF CACHE BOOL "disable iOS client") set (WITH_SERVER OFF CACHE BOOL "disable iOS server") set (WITH_KRB5 OFF CACHE BOOL "Kerberos support") -set (WITH_CLIENT_SDL OFF CACHE BOOL "SDL client") -set (WITH_FFMPEG OFF CACHE BOOL "SDL client") -set (WITH_SWSCALE OFF CACHE BOOL "SDL client") -set (WITH_NEON ON CACHE BOOL "SDL client") -set (BUILD_SHARED_LIBS OFF CACHE BOOL "SDL client") +set (WITH_CLIENT_SDL OFF CACHE BOOL "iOS preload") +set (WITH_FFMPEG OFF CACHE BOOL "iOS preload") +set (WITH_SWSCALE OFF CACHE BOOL "iOS preload") +set (WITH_NEON ON CACHE BOOL "iOS preload") +set (WITH_OPUS OFF CACHE BOOL "iOS preload") +set (BUILD_SHARED_LIBS OFF CACHE BOOL "iOS preload") diff --git a/ci/cmake-preloads/config-macosx.txt b/ci/cmake-preloads/config-macosx.txt index c52aabe8a..3282118cd 100644 --- a/ci/cmake-preloads/config-macosx.txt +++ b/ci/cmake-preloads/config-macosx.txt @@ -13,4 +13,5 @@ set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated comman set (WITH_KRB5 OFF CACHE BOOL "Kerberos support") set (WITH_WEBVIEW OFF CACHE BOOL "ci default") set (WITH_FFMPEG OFF CACHE BOOL "ci default") +set (WITH_OPUS OFF CACHE BOOL "ci default") set (WITH_SWSCALE OFF CACHE BOOL "ci default") diff --git a/libfreerdp/codec/CMakeLists.txt b/libfreerdp/codec/CMakeLists.txt index 6eedc1910..811009525 100644 --- a/libfreerdp/codec/CMakeLists.txt +++ b/libfreerdp/codec/CMakeLists.txt @@ -127,7 +127,7 @@ option(WITH_OPUS "compile with opus codec support" ${OPUS_DEFAULT}) if (WITH_OPUS) find_package(Opus) if (Opus_FOUND) - list(APPEND CODEC_LIBS Opus::opus) + list(APPEND CODEC_LIBS ${OPUS_LIBRARIES}) else() find_package(PkgConfig REQUIRED) pkg_check_modules(OPUS REQUIRED opus)