Skip to content

Commit c7f0df0

Browse files
committed
Drop iOS support and cleanup build logic
1 parent 5650b07 commit c7f0df0

2 files changed

Lines changed: 8 additions & 20 deletions

File tree

.github/workflows/build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ jobs:
2121
target: mac-os
2222
# macOS runner is arm64, so we disable universal binary to avoid x86_64 linking errors with arm64 Python
2323
extra-args: "-DGEODE_DISABLE_UNIVERSAL_BINARY=ON"
24-
- name: iOS
25-
os: macos-latest
26-
target: ios
27-
extra-args: ""
2824
- name: Android64
2925
os: ubuntu-latest
3026
target: android64

CMakeLists.txt

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,25 @@ if (Python3_ROOT_DIR)
1010
set(Python3_FIND_STRATEGY LOCATION)
1111
endif()
1212

13-
if (ANDROID OR IOS)
13+
if (ANDROID)
1414
if (NOT DEFINED PREBUILT_PYTHON_PATH)
1515
if (Python3_ROOT_DIR)
1616
set(PREBUILT_PYTHON_PATH ${Python3_ROOT_DIR})
1717
else()
18-
message(WARNING "PREBUILT_PYTHON_PATH and Python3_ROOT_DIR not set for mobile platform!")
18+
message(WARNING "PREBUILT_PYTHON_PATH and Python3_ROOT_DIR not set for Android!")
1919
endif()
2020
endif()
2121

2222
if (PREBUILT_PYTHON_PATH)
2323
add_library(Python3_Mobile INTERFACE)
2424
target_include_directories(Python3_Mobile INTERFACE ${PREBUILT_PYTHON_PATH}/include)
2525

26-
if (ANDROID)
27-
find_library(PYTHON_LIB python3.11 PATHS ${PREBUILT_PYTHON_PATH}/lib NO_DEFAULT_PATH)
28-
if (NOT PYTHON_LIB)
29-
find_library(PYTHON_LIB python3 PATHS ${PREBUILT_PYTHON_PATH}/lib NO_DEFAULT_PATH)
30-
endif()
31-
target_link_libraries(Python3_Mobile INTERFACE ${PYTHON_LIB})
32-
elseif (IOS)
33-
# iOS usually uses static linking for embedded Python
34-
find_library(PYTHON_LIB python3.11 PATHS ${PREBUILT_PYTHON_PATH}/lib NO_DEFAULT_PATH)
35-
if (NOT PYTHON_LIB)
36-
find_library(PYTHON_LIB python3 PATHS ${PREBUILT_PYTHON_PATH}/lib NO_DEFAULT_PATH)
37-
endif()
38-
target_link_libraries(Python3_Mobile INTERFACE ${PYTHON_LIB})
26+
find_library(PYTHON_LIB python3.11 PATHS ${PREBUILT_PYTHON_PATH}/lib NO_DEFAULT_PATH)
27+
if (NOT PYTHON_LIB)
28+
find_library(PYTHON_LIB python3 PATHS ${PREBUILT_PYTHON_PATH}/lib NO_DEFAULT_PATH)
3929
endif()
30+
target_link_libraries(Python3_Mobile INTERFACE ${PYTHON_LIB})
31+
4032
set(PYTHON_TARGET Python3_Mobile)
4133
else()
4234
message(STATUS "Python Runtime will attempt to find Python despite no PREBUILT_PYTHON_PATH provided.")
@@ -56,7 +48,7 @@ add_library(${PROJECT_NAME} SHARED ${SOURCES})
5648
# Use plain linking to match Geode's internal style
5749
target_link_libraries(${PROJECT_NAME} ${PYTHON_TARGET})
5850

59-
if (NOT ANDROID AND NOT IOS)
51+
if (NOT ANDROID)
6052
target_include_directories(${PROJECT_NAME} PRIVATE ${Python3_INCLUDE_DIRS})
6153
endif()
6254

0 commit comments

Comments
 (0)