Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff --git a/android/src/main/jni/CMakeLists.txt b/android/src/main/jni/CMakeLists.txt
index f720c8e8808c01eab3446b0a819f48aa355077de..0484a6409c2c92ab6971a9b8d607e800a54dea9c 100644
--- a/android/src/main/jni/CMakeLists.txt
+++ b/android/src/main/jni/CMakeLists.txt
@@ -9,15 +9,6 @@ set(LIB_COMMON_DIR ${LIB_ANDROID_DIR}/../common/cpp)
set(LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/build/generated/source/codegen/jni)
set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/renderer/components/${LIB_LITERAL})

-add_compile_options(
- -fexceptions
- -frtti
- -std=c++20
- -Wall
- -Wpedantic
- -Wno-gnu-zero-variadic-macro-arguments
-)
-
file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp ${LIB_COMMON_DIR}/react/renderer/components/${LIB_LITERAL}/*.cpp)
file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_JNI_DIR}/*.cpp ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)

@@ -70,6 +61,21 @@ else()
)
endif()

+if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
+ target_compile_reactnative_options(${LIB_TARGET_NAME} PUBLIC)
+else()
+ target_compile_options(
+ ${LIB_TARGET_NAME}
+ PRIVATE
+ -fexceptions
+ -frtti
+ -std=c++20
+ -Wall
+ -Wpedantic
+ -Wno-gnu-zero-variadic-macro-arguments
+ )
+endif()
+
target_compile_options(
${LIB_TARGET_NAME}
PRIVATE
Loading
Loading