Skip to content

Commit 1bc427c

Browse files
authored
chore: sync bgfx and bump ios-cmake (#1408)
This PR syncs bgfx and bumps ios-cmake (contains necessary fixes for visionOS work).
1 parent 14f4c60 commit 1bc427c

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

Apps/Playground/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ if(APPLE)
5353
PRIVATE ${JAVASCRIPTCORE_LIBRARY}
5454
PRIVATE NativeCamera)
5555
set(RESOURCE_FILES ${STORYBOARD})
56+
5657
elseif(UNIX)
5758
set(SOURCES
5859
${SOURCES}
@@ -173,6 +174,8 @@ if(APPLE)
173174
FOLDER "Playground")
174175
endif()
175176
set_property(TARGET Playground PROPERTY UNITY_BUILD false)
177+
set_property(TARGET Playground PROPERTY XCODE_GENERATE_SCHEME YES)
178+
set_property(TARGET Playground PROPERTY XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED YES)
176179
endif()
177180

178181
if(WINDOWS_STORE)
@@ -205,3 +208,4 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${REFERENCE_IMAGES})
205208
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SCRIPTS})
206209
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES})
207210
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Playground)
211+

Apps/UnitTests/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,5 @@ endforeach()
6060

6161
set_property(TARGET UnitTests PROPERTY FOLDER Apps)
6262
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} ${SCRIPTS})
63-
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../node_modules PREFIX node_modules FILES ${EXTERNAL_SCRIPTS})
63+
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../node_modules PREFIX node_modules FILES ${EXTERNAL_SCRIPTS})
64+
set_property(TARGET UnitTests PROPERTY XCODE_GENERATE_SCHEME YES)

CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ FetchContent_Declare(AndroidExtensions
1414
GIT_TAG 7d88a601fda9892791e7b4e994e375e049615688)
1515
FetchContent_Declare(arcana.cpp
1616
GIT_REPOSITORY https://github.com/microsoft/arcana.cpp.git
17-
GIT_TAG f2757396e80bc4169f2ddb938ce25367a98ffdd0)
17+
GIT_TAG 1a8a5d6e95413ed14b38a6ac9419048f9a9c8009)
1818
FetchContent_Declare(arcore-android-sdk
1919
GIT_REPOSITORY https://github.com/google-ar/arcore-android-sdk.git
2020
GIT_TAG 98cb803de5482fb2b36effe8be3b5a0d3b726976)
@@ -23,7 +23,7 @@ FetchContent_Declare(base-n
2323
GIT_TAG 7573e77c0b9b0e8a5fb63d96dbde212c921993b4)
2424
FetchContent_Declare(bgfx.cmake
2525
GIT_REPOSITORY https://github.com/BabylonJS/bgfx.cmake.git
26-
GIT_TAG 345e3e28a9912983fc64d1dcb4da22a445afe3fd)
26+
GIT_TAG 17e2f84510dbb69c87a02b08fb11cecb2c4afc9b)
2727
FetchContent_Declare(CMakeExtensions
2828
GIT_REPOSITORY https://github.com/BabylonJS/CMakeExtensions.git
2929
GIT_TAG ea28b7689530bfdc4905806f27ecf7e8ed4b5419)
@@ -34,7 +34,7 @@ FetchContent_Declare(googletest
3434
URL "https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz")
3535
FetchContent_Declare(ios-cmake
3636
GIT_REPOSITORY https://github.com/leetal/ios-cmake.git
37-
GIT_TAG 4.4.1)
37+
GIT_TAG 4.5.0)
3838
FetchContent_Declare(JsRuntimeHost
3939
GIT_REPOSITORY https://github.com/BabylonJS/JsRuntimeHost.git
4040
GIT_TAG 9ccb9477a97501525f3f9ca0e00e6971934037ec)
@@ -141,6 +141,9 @@ if(MSVC)
141141
# https://gitlab.kitware.com/cmake/cmake/-/issues/18837
142142
add_compile_options(/Zc:__cplusplus)
143143

144+
# https://devblogs.microsoft.com/cppblog/announcing-full-support-for-a-c-c-conformant-preprocessor-in-msvc/
145+
add_compile_options(/Zc:preprocessor)
146+
144147
# default to /W3
145148
add_compile_options(/W3)
146149
endif()

0 commit comments

Comments
 (0)