blob: 73f0cb6f7ca3cfcaaa2f6eaf4d1fbfaaf0b4b544 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From 38fa77b0b86891d3b5e6128746f36a2b9f069bef Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Tue, 5 Nov 2024 16:52:23 +0100
Subject: [PATCH] fix ios builds
---
CMakeLists.txt | 6 +++---
contrib/depends/.gitignore | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04790815..5e6a9ae7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,6 +130,8 @@ else()
set(ARCH default CACHE STRING "CPU to build for: -march value or default")
if("${ARCH}" STREQUAL "default")
set(ARCH_FLAG "")
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+ set(ARCH_FLAG "")
else()
set(ARCH_FLAG "-march=${ARCH}")
endif()
@@ -201,7 +203,7 @@ else()
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${RELEASE_FLAGS}")
if(STATIC)
if(APPLE)
- message(SEND_ERROR "Static build is not supported on MacOS X")
+ message("Static build is not supported on MacOS X")
else()
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
endif()
@@ -245,8 +247,6 @@ else()
find_package(Boost 1.70 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale log)
endif()
-
-
message(STATUS "Boost: ${Boost_VERSION} from ${Boost_LIBRARY_DIRS}")
diff --git a/contrib/depends/.gitignore b/contrib/depends/.gitignore
index 3cb4b9ac..85d2e249 100644
--- a/contrib/depends/.gitignore
+++ b/contrib/depends/.gitignore
@@ -8,3 +8,4 @@ i686*
mips*
arm*
aarch64*
+host-*
--
2.39.3 (Apple Git-146)
|
