Skip to content

Commit fec7975

Browse files
authored
Build fixes (#135)
1 parent 06d4420 commit fec7975

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ include(FetchContent)
1111
# --------------------------------------------------
1212
FetchContent_Declare(AndroidExtensions
1313
GIT_REPOSITORY https://github.com/BabylonJS/AndroidExtensions.git
14-
GIT_TAG f7ed149b5360cc8a4908fece66607c5ce1e6095b
14+
GIT_TAG 2d5af72259cc73e5f249d3c99bee2010be9cb042
1515
EXCLUDE_FROM_ALL)
1616
FetchContent_Declare(arcana.cpp
1717
GIT_REPOSITORY https://github.com/microsoft/arcana.cpp.git
@@ -23,7 +23,7 @@ FetchContent_Declare(asio
2323
EXCLUDE_FROM_ALL)
2424
FetchContent_Declare(CMakeExtensions
2525
GIT_REPOSITORY https://github.com/BabylonJS/CMakeExtensions.git
26-
GIT_TAG ea28b7689530bfdc4905806f27ecf7e8ed4b5419
26+
GIT_TAG dc750e7f69dad76779419df6442f834c57a30a1f
2727
EXCLUDE_FROM_ALL)
2828
FetchContent_Declare(googletest
2929
URL "https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz"
@@ -37,7 +37,7 @@ FetchContent_Declare(llhttp
3737
EXCLUDE_FROM_ALL)
3838
FetchContent_Declare(UrlLib
3939
GIT_REPOSITORY https://github.com/BabylonJS/UrlLib.git
40-
GIT_TAG 1f9d2c05f792d994b09fdfc1129b25294efbe182
40+
GIT_TAG e698870b37b2e302fb179a137d7a96cc6813d2de
4141
EXCLUDE_FROM_ALL)
4242
# --------------------------------------------------
4343

Tests/UnitTests/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,15 @@ target_link_libraries(UnitTests
6161
add_custom_command(TARGET UnitTests POST_BUILD
6262
COMMAND ${CMAKE_COMMAND} -E $<IF:$<BOOL:$<TARGET_RUNTIME_DLLS:UnitTests>>,copy,true> $<TARGET_RUNTIME_DLLS:UnitTests> $<TARGET_FILE_DIR:UnitTests> COMMAND_EXPAND_LISTS)
6363

64+
if(APPLE)
65+
enable_objc_arc(UnitTests)
66+
endif()
67+
6468
if(IOS)
6569
set_target_properties(UnitTests PROPERTIES
6670
MACOSX_BUNDLE true
6771
MACOSX_BUNDLE_INFO_PLIST "${PLIST_FILE}"
6872
RESOURCE "${STORYBOARD}"
69-
XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
7073
XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET}
7174
XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.jsruntimehost.unittests")
7275
else()

0 commit comments

Comments
 (0)