Skip to content

Commit 83a8751

Browse files
Fixed library search in iOS build
1 parent a86f7c4 commit 83a8751

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

CMakeLists.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,21 @@ if(PLATFORM_MACOS)
141141
if (NOT APP_KIT)
142142
message(FATAL_ERROR "AppKit not found")
143143
endif()
144+
elseif(PLATFORM_IOS)
145+
find_library(CORE_FOUNDATION CoreFoundation)
146+
if(NOT CORE_FOUNDATION)
147+
message(FATAL_ERROR "Cannot find CoreFoundation framework")
148+
endif()
149+
150+
find_library(FOUNDATION Foundation)
151+
if(NOT FOUNDATION)
152+
message(FATAL_ERROR "Cannot find Foundation framework")
153+
endif()
154+
155+
find_library(OPENGLES OpenGLES)
156+
if(NOT OPENGLES)
157+
message(FATAL_ERROR "Cannot find OpenGLES framework")
158+
endif()
144159
endif()
145160

146161
include(BuildUtils.cmake)

Graphics/GraphicsEngineOpenGL/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,9 @@ elseif(PLATFORM_LINUX)
179179
set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static)
180180
elseif(PLATFORM_MACOS)
181181
find_package(OpenGL REQUIRED)
182-
set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static ${OPENGL_LIBRARY} ${APP_KIT})
182+
set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static ${OPENGL_LIBRARY})
183183
elseif(PLATFORM_IOS)
184-
# How is OPENGLES defined?
185-
if(NOT OPENGLES)
186-
message(FATAL_ERROR "Cannot find OPENGLES framework")
187-
endif()
188-
set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} ${APP_KIT} ${OPENGLES})
184+
set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} ${OPENGLES})
189185
else()
190186
message(FATAL_ERROR "Unknown platform")
191187
endif()

Platforms/Apple/CMakeLists.txt

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,14 @@ PUBLIC
2929
BuildSettings
3030
BasicPlatform
3131
PlatformInterface
32-
PRIVATE
33-
${APP_KIT}
3432
)
3533

36-
if(PLATFORM_IOS)
37-
if(NOT CORE_FOUNDATION)
38-
message(FATAL_ERROR "Cannot find CoreFoundation framework")
39-
endif()
40-
41-
if(NOT FOUNDATION)
42-
message(FATAL_ERROR "Cannot find Foundation framework")
43-
endif()
44-
34+
if(PLATFORM_MACOS)
35+
target_link_libraries(ApplePlatform
36+
PRIVATE
37+
${APP_KIT}
38+
)
39+
elseif(PLATFORM_IOS)
4540
target_link_libraries(ApplePlatform
4641
PRIVATE
4742
${CORE_FOUNDATION}

0 commit comments

Comments
 (0)