From 47b75c6ee00af4483e546a108ffe29022b9d98fb Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Wed, 21 Oct 2020 12:08:00 -0700 Subject: [PATCH 1/2] Fix CMake build error in android build when compling on windows. --- Modules/@babylonjs/react-native/android/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Modules/@babylonjs/react-native/android/CMakeLists.txt b/Modules/@babylonjs/react-native/android/CMakeLists.txt index b504f072a..845b10660 100644 --- a/Modules/@babylonjs/react-native/android/CMakeLists.txt +++ b/Modules/@babylonjs/react-native/android/CMakeLists.txt @@ -23,11 +23,12 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") set(BABYLON_NATIVE_PLATFORM "Android") set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") +file(TO_CMAKE_PATH "${REACTNATIVE_DIR}" REACTNATIVE_DIR_CMAKE) # Configure Babylon Native to use JSI set(NAPI_JAVASCRIPT_ENGINE "JSI" CACHE STRING "The JavaScript engine to power N-API") add_subdirectory(${REACTNATIVE_DIR}/ReactCommon/jsi/jsi ${CMAKE_CURRENT_BINARY_DIR}/jsi) -target_include_directories(jsi INTERFACE ${REACTNATIVE_DIR}/ReactCommon/jsi) +target_include_directories(jsi INTERFACE ${REACTNATIVE_DIR_CMAKE}/ReactCommon/jsi) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/src/") @@ -45,10 +46,10 @@ set_target_properties(fbjni PROPERTIES # Define a minimal version of libturbomodulejsijni.so that includes CallInvokerHolder.cpp. # This is the only part of the TurboModule system we need for now. Eventually when TurboModule # support ships with React Native, we'll need to strip this back out. -list(APPEND TURBOMODULE_INC_DIRS "${REACTNATIVE_DIR}/ReactCommon/callinvoker") -list(APPEND TURBOMODULE_INC_DIRS "${REACTNATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni") +list(APPEND TURBOMODULE_INC_DIRS "${REACTNATIVE_DIR_CMAKE}/ReactCommon/callinvoker") +list(APPEND TURBOMODULE_INC_DIRS "${REACTNATIVE_DIR_CMAKE}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni") add_library(turbomodulejsijni SHARED - ${REACTNATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp) + ${REACTNATIVE_DIR_CMAKE}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp) target_include_directories(turbomodulejsijni PUBLIC "${TURBOMODULE_INC_DIRS}") target_link_libraries(turbomodulejsijni fbjni) From 4648f2572534fe29dfbbbcbbc03ed209090b7706 Mon Sep 17 00:00:00 2001 From: Alex Tran Date: Wed, 21 Oct 2020 12:11:59 -0700 Subject: [PATCH 2/2] Replace one more instance of REACTNATIVE_DIR --- Modules/@babylonjs/react-native/android/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/android/CMakeLists.txt b/Modules/@babylonjs/react-native/android/CMakeLists.txt index 845b10660..bdf8ab98b 100644 --- a/Modules/@babylonjs/react-native/android/CMakeLists.txt +++ b/Modules/@babylonjs/react-native/android/CMakeLists.txt @@ -27,7 +27,7 @@ file(TO_CMAKE_PATH "${REACTNATIVE_DIR}" REACTNATIVE_DIR_CMAKE) # Configure Babylon Native to use JSI set(NAPI_JAVASCRIPT_ENGINE "JSI" CACHE STRING "The JavaScript engine to power N-API") -add_subdirectory(${REACTNATIVE_DIR}/ReactCommon/jsi/jsi ${CMAKE_CURRENT_BINARY_DIR}/jsi) +add_subdirectory(${REACTNATIVE_DIR_CMAKE}/ReactCommon/jsi/jsi ${CMAKE_CURRENT_BINARY_DIR}/jsi) target_include_directories(jsi INTERFACE ${REACTNATIVE_DIR_CMAKE}/ReactCommon/jsi) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/src/")