Skip to content

Commit 13df926

Browse files
author
C. M. Barth
authored
Fix breaking ci change in BabylonNative from moving to consuming babylon.js through npm (#221)
* update babylonnative dependency to commit with known break * try fixing break * test ios * fix cmake definition * update gulp task for ios to exclude apps dirs * move back to master * revert change to see if we can just exclude unused components/directories * install npm packages for iOS build * undo cmake change * use cmakeExclude * move back to master * avoid exclude from all definition * add platform definition * remove exclude from all * add comment
1 parent 7620be2 commit 13df926

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Modules/@babylonjs/react-native/ios/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.13.2)
22
project(ReactNativeBabylon)
33
include(${CMAKE_CURRENT_LIST_DIR}/../shared/CMakeLists.txt)
44

5+
set(BABYLON_NATIVE_PLATFORM "Apple")
56
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
67
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
78
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -x objective-c++")
@@ -23,7 +24,11 @@ target_include_directories(reactnative INTERFACE ${REACTNATIVE_DIR}/ReactCommon/
2324
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/")
2425

2526
set(BABYLON_NATIVE_DIR "${CMAKE_CURRENT_LIST_DIR}/../submodules/BabylonNative")
26-
add_subdirectory(${BABYLON_NATIVE_DIR} ${BABYLON_NATIVE_DIR}/build/ios/)
27+
# Only add the subdirectories we need to avoid consuming the BabylonNative/Apps folder
28+
add_subdirectory("${BABYLON_NATIVE_DIR}/Dependencies" ${BABYLON_NATIVE_DIR}/build/ios/Dependencies EXCLUDE_FROM_ALL)
29+
add_subdirectory("${BABYLON_NATIVE_DIR}/Core" ${BABYLON_NATIVE_DIR}/build/ios/Core EXCLUDE_FROM_ALL)
30+
add_subdirectory("${BABYLON_NATIVE_DIR}/Plugins" ${BABYLON_NATIVE_DIR}/build/ios/Plugins EXCLUDE_FROM_ALL)
31+
add_subdirectory("${BABYLON_NATIVE_DIR}/Polyfills" ${BABYLON_NATIVE_DIR}/build/ios/Polyfills EXCLUDE_FROM_ALL)
2732

2833
set(BABYLON_REACT_NATIVE_SHARED_DIR "${CMAKE_CURRENT_LIST_DIR}/../shared")
2934
add_subdirectory(${BABYLON_REACT_NATIVE_SHARED_DIR} ${CMAKE_CURRENT_BINARY_DIR}/shared)
Submodule BabylonNative updated 50 files

0 commit comments

Comments
 (0)