From 2e80a0de8e4139a226a094815c07924818f4bc7d Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Tue, 10 Oct 2023 11:19:40 +0200 Subject: [PATCH 1/2] ci: remove DARWIN compile flag from iOS build --- .github/workflows/ios.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 50502aa72..fa3865bbc 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -11,5 +11,5 @@ jobs: - name: build run: | - cmake -B build -G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=ON -DUSE_OPENSSL=OFF -DCMAKE_C_FLAGS="-DDARWIN -Werror" + cmake -B build -G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=ON -DUSE_OPENSSL=OFF -DCMAKE_C_FLAGS="-Werror" cmake --build build -- CODE_SIGNING_ALLOWED=NO From 0020638878eefc3e92aeccc1773c6f4eb4cb5fba Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Tue, 10 Oct 2023 13:18:18 +0200 Subject: [PATCH 2/2] define DARWIN for iOS --- cmake/re-config.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/re-config.cmake b/cmake/re-config.cmake index 7a5983b14..34ebe80a5 100644 --- a/cmake/re-config.cmake +++ b/cmake/re-config.cmake @@ -173,6 +173,8 @@ endif() if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") list(APPEND RE_DEFINITIONS DARWIN) include_directories(/opt/local/include) +elseif(${CMAKE_SYSTEM_NAME} MATCHES "iOS") + list(APPEND RE_DEFINITIONS DARWIN) elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") list(APPEND RE_DEFINITIONS FREEBSD) elseif(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")