Skip to content

Commit ae804df

Browse files
committed
ios
1 parent ae0c286 commit ae804df

File tree

9 files changed

+22
-8
lines changed

9 files changed

+22
-8
lines changed

build/cmake/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,17 @@ endif()
1717

1818
set(CMAKE_TOOLCHAIN_FILE ${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
1919

20+
# In case of ios we always build for simulator for now.
21+
# Need to do this check before project() declaration, so use CMAKE_SYSTEM_NAME instead of IOS variable.
22+
if(CMAKE_SYSTEM_NAME STREQUAL iOS)
23+
# In order to install ios _simulator_ vcpkg packages we need to set the vcpkg target triplet.
24+
set(VCPKG_TARGET_TRIPLET arm64-ios-simulator)
25+
26+
# TODO: not needed? Remove.
27+
# set(CMAKE_OSX_SYSROOT iphonesimulator)
28+
29+
endif()
30+
2031
# Set myci config directory for find_package(myci). The path has to be absolute.
2132
set(myci_DIR ../../repos/myci/src/cmake)
2233
cmake_path(ABSOLUTE_PATH myci_DIR NORMALIZE)

build/cmake/vcpkg.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
"freetype",
44
"libjpeg-turbo",
55
"libpng",
6-
"glew",
6+
{
7+
"name": "glew",
8+
"platform": "!ios"
9+
},
710
{
811
"name": "angle",
912
"platform": "windows"

repos/myci

repos/nitki

repos/ruis

repos/ruis-render-opengl

repos/utki

0 commit comments

Comments
 (0)