From 3ab4d9461b31a8cf5e569d257a930561ff8d9035 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 18 Jun 2020 19:54:39 +0200
Subject: [PATCH] CMake: add missing libraries for iOS build

Remove unused section from file list.
---
 build/bakefiles/files.bkl           |  4 ----
 build/cmake/files.cmake             |  4 ----
 build/cmake/lib/base/CMakeLists.txt | 19 +++++++++++--------
 build/cmake/lib/core/CMakeLists.txt | 12 ++++++++++++
 build/files                         |  3 ---
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index c9033ad5a7..b0633e6049 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -226,10 +226,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/cocoa/utils.mm
 </set>
 
-<set var="BASE_AND_GUI_OSX_IPHONE_SRC" hints="files">
-    src/osx/iphone/utils.mm
-</set>
-
 <!-- Base files used by non-wxMac OS X builds -->
 <set var="BASE_OSX_NOTWXMAC_SRC" hints="files">
     $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 8f13edf843..ec4b247d8b 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -153,10 +153,6 @@ set(BASE_AND_GUI_OSX_COCOA_SRC
     src/osx/cocoa/power.mm
 )
 
-set(BASE_AND_GUI_OSX_IPHONE_SRC
-    src/osx/iphone/utils.mm
-)
-
 set(BASE_OSX_NOTWXMAC_SRC
     ${BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC}
     ${BASE_COREFOUNDATION_SRC}
diff --git a/build/cmake/lib/base/CMakeLists.txt b/build/cmake/lib/base/CMakeLists.txt
index cd897c3154..4da98e6f48 100644
--- a/build/cmake/lib/base/CMakeLists.txt
+++ b/build/cmake/lib/base/CMakeLists.txt
@@ -17,9 +17,7 @@ if(WIN32)
     wx_append_sources(BASE_FILES BASE_AND_GUI_WIN32)
 elseif(APPLE)
     wx_append_sources(BASE_FILES BASE_OSX_SHARED)
-    if(wxBUILD_TOOLKIT MATCHES "osx_iphone")
-        wx_append_sources(BASE_FILES BASE_AND_GUI_OSX_IPHONE)
-    else()
+    if(WXOSX_COCOA)
         wx_append_sources(BASE_FILES BASE_AND_GUI_OSX_COCOA)
     endif()
 elseif(UNIX)
@@ -58,14 +56,19 @@ endif()
 
 if(APPLE)
     wx_lib_link_libraries(wxbase
-        PRIVATE
-        "-framework Security"
         PUBLIC
-        "-framework Carbon"
-        "-framework Cocoa"
         "-framework CoreFoundation"
-        "-framework IOKit"
     )
+    if(WXOSX_COCOA)
+        wx_lib_link_libraries(wxbase
+            PRIVATE
+            "-framework Security"
+            PUBLIC
+            "-framework Carbon"
+            "-framework Cocoa"
+            "-framework IOKit"
+        )
+    endif()
 elseif(UNIX)
     wx_lib_link_libraries(wxbase PRIVATE dl)
 endif()
diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt
index d9f423c8f8..95be60c49a 100644
--- a/build/cmake/lib/core/CMakeLists.txt
+++ b/build/cmake/lib/core/CMakeLists.txt
@@ -47,6 +47,9 @@ elseif(WXOSX_COCOA)
     wx_append_sources(CORE_SRC OSX_LOWLEVEL)
     wx_append_sources(CORE_SRC OSX_SHARED)
     wx_append_sources(CORE_SRC OSX_COCOA)
+elseif(WXOSX_IPHONE)
+    wx_append_sources(CORE_SRC OSX_LOWLEVEL)
+    wx_append_sources(CORE_SRC OSX_IPHONE)
 elseif(WXQT)
     wx_append_sources(CORE_SRC QT)
     if(WIN32)
@@ -76,6 +79,15 @@ if(WXOSX_COCOA)
         wx_lib_link_libraries(wxcore PUBLIC "-framework WebKit")
     endif()
 endif()
+if(WXOSX_IPHONE)
+    wx_lib_link_libraries(wxcore
+        PUBLIC
+        "-framework AudioToolbox"
+        "-framework CoreGraphics"
+        "-framework CoreText"
+        "-framework UIKit"
+        )
+endif()
 if(WXGTK AND wxUSE_PRIVATE_FONTS)
     wx_lib_include_directories(wxcore PUBLIC ${FONTCONFIG_INCLUDE_DIRS} ${PANGOFT2_INCLUDE_DIRS})
     wx_lib_link_libraries(wxcore PUBLIC ${FONTCONFIG_LIBRARIES} ${PANGOFT2_LIBRARIES})
diff --git a/build/files b/build/files
index 1041ccd31b..e40f07b3cb 100644
--- a/build/files
+++ b/build/files
@@ -176,9 +176,6 @@ BASE_AND_GUI_OSX_COCOA_SRC =
     src/osx/cocoa/utils.mm
     src/osx/cocoa/power.mm
 
-BASE_AND_GUI_OSX_IPHONE_SRC =
-    src/osx/iphone/utils.mm
-
 # files used by non-wxMac OS X builds
 BASE_OSX_NOTWXMAC_SRC =
     $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)