Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

chore: sync bgfx and bump ios-cmake #1408

Merged
merged 2 commits into from
Aug 27, 2024
Merged

chore: sync bgfx and bump ios-cmake #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6a7c6f
chore: sync bgfx and bump ios-cmake
okwasniewski Aug 22, 2024
4683e94
fix: iOS builds, generate only necessary schemes
okwasniewski Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Apps/Playground/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ if(APPLE)
PRIVATE ${JAVASCRIPTCORE_LIBRARY}
PRIVATE NativeCamera)
set(RESOURCE_FILES ${STORYBOARD})

elseif(UNIX)
set(SOURCES
${SOURCES}
Expand Down Expand Up @@ -173,6 +174,8 @@ if(APPLE)
FOLDER "Playground")
endif()
set_property(TARGET Playground PROPERTY UNITY_BUILD false)
set_property(TARGET Playground PROPERTY XCODE_GENERATE_SCHEME YES)
okwasniewski marked this conversation as resolved.
Show resolved Hide resolved
set_property(TARGET Playground PROPERTY XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED YES)
okwasniewski marked this conversation as resolved.
Show resolved Hide resolved
endif()

if(WINDOWS_STORE)
Expand Down Expand Up @@ -205,3 +208,4 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${REFERENCE_IMAGES})
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SCRIPTS})
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES})
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Playground)

3 changes: 2 additions & 1 deletion Apps/UnitTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@ endforeach()

set_property(TARGET UnitTests PROPERTY FOLDER Apps)
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} ${SCRIPTS})
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../node_modules PREFIX node_modules FILES ${EXTERNAL_SCRIPTS})
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../node_modules PREFIX node_modules FILES ${EXTERNAL_SCRIPTS})
set_property(TARGET UnitTests PROPERTY XCODE_GENERATE_SCHEME YES)
9 changes: 6 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ FetchContent_Declare(AndroidExtensions
GIT_TAG 7d88a601fda9892791e7b4e994e375e049615688)
FetchContent_Declare(arcana.cpp
GIT_REPOSITORY https://github.com/microsoft/arcana.cpp.git
GIT_TAG f2757396e80bc4169f2ddb938ce25367a98ffdd0)
GIT_TAG 1a8a5d6e95413ed14b38a6ac9419048f9a9c8009)
FetchContent_Declare(arcore-android-sdk
GIT_REPOSITORY https://github.com/google-ar/arcore-android-sdk.git
GIT_TAG 98cb803de5482fb2b36effe8be3b5a0d3b726976)
Expand All @@ -23,7 +23,7 @@ FetchContent_Declare(base-n
GIT_TAG 7573e77c0b9b0e8a5fb63d96dbde212c921993b4)
FetchContent_Declare(bgfx.cmake
GIT_REPOSITORY https://github.com/BabylonJS/bgfx.cmake.git
GIT_TAG 345e3e28a9912983fc64d1dcb4da22a445afe3fd)
GIT_TAG 17e2f84510dbb69c87a02b08fb11cecb2c4afc9b)
FetchContent_Declare(CMakeExtensions
GIT_REPOSITORY https://github.com/BabylonJS/CMakeExtensions.git
GIT_TAG ea28b7689530bfdc4905806f27ecf7e8ed4b5419)
Expand All @@ -34,7 +34,7 @@ FetchContent_Declare(googletest
URL "https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz")
FetchContent_Declare(ios-cmake
GIT_REPOSITORY https://github.com/leetal/ios-cmake.git
GIT_TAG 4.4.1)
GIT_TAG 4.5.0)
ryantrem marked this conversation as resolved.
Show resolved Hide resolved
FetchContent_Declare(JsRuntimeHost
GIT_REPOSITORY https://github.com/BabylonJS/JsRuntimeHost.git
GIT_TAG 9ccb9477a97501525f3f9ca0e00e6971934037ec)
Expand Down Expand Up @@ -141,6 +141,9 @@ if(MSVC)
# https://gitlab.kitware.com/cmake/cmake/-/issues/18837
add_compile_options(/Zc:__cplusplus)

# https://devblogs.microsoft.com/cppblog/announcing-full-support-for-a-c-c-conformant-preprocessor-in-msvc/
okwasniewski marked this conversation as resolved.
Show resolved Hide resolved
add_compile_options(/Zc:preprocessor)

# default to /W3
add_compile_options(/W3)
endif()
Expand Down