Skip to content

Commit 4ed730e

Browse files
authored
Fix CMake build break on windows (#101)
* Fix CMake build error in android build when compling on windows. * Replace one more instance of REACTNATIVE_DIR
1 parent e841904 commit 4ed730e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
2323
set(BABYLON_NATIVE_PLATFORM "Android")
2424
set(CMAKE_CXX_EXTENSIONS OFF)
2525
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
26+
file(TO_CMAKE_PATH "${REACTNATIVE_DIR}" REACTNATIVE_DIR_CMAKE)
2627

2728
# Configure Babylon Native to use JSI
2829
set(NAPI_JAVASCRIPT_ENGINE "JSI" CACHE STRING "The JavaScript engine to power N-API")
29-
add_subdirectory(${REACTNATIVE_DIR}/ReactCommon/jsi/jsi ${CMAKE_CURRENT_BINARY_DIR}/jsi)
30-
target_include_directories(jsi INTERFACE ${REACTNATIVE_DIR}/ReactCommon/jsi)
30+
add_subdirectory(${REACTNATIVE_DIR_CMAKE}/ReactCommon/jsi/jsi ${CMAKE_CURRENT_BINARY_DIR}/jsi)
31+
target_include_directories(jsi INTERFACE ${REACTNATIVE_DIR_CMAKE}/ReactCommon/jsi)
3132

3233
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/src/")
3334

@@ -45,10 +46,10 @@ set_target_properties(fbjni PROPERTIES
4546
# Define a minimal version of libturbomodulejsijni.so that includes CallInvokerHolder.cpp.
4647
# This is the only part of the TurboModule system we need for now. Eventually when TurboModule
4748
# support ships with React Native, we'll need to strip this back out.
48-
list(APPEND TURBOMODULE_INC_DIRS "${REACTNATIVE_DIR}/ReactCommon/callinvoker")
49-
list(APPEND TURBOMODULE_INC_DIRS "${REACTNATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni")
49+
list(APPEND TURBOMODULE_INC_DIRS "${REACTNATIVE_DIR_CMAKE}/ReactCommon/callinvoker")
50+
list(APPEND TURBOMODULE_INC_DIRS "${REACTNATIVE_DIR_CMAKE}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni")
5051
add_library(turbomodulejsijni SHARED
51-
${REACTNATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp)
52+
${REACTNATIVE_DIR_CMAKE}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp)
5253
target_include_directories(turbomodulejsijni PUBLIC "${TURBOMODULE_INC_DIRS}")
5354
target_link_libraries(turbomodulejsijni
5455
fbjni)

0 commit comments

Comments
 (0)