File tree Expand file tree Collapse file tree 1 file changed +21
-21
lines changed Expand file tree Collapse file tree 1 file changed +21
-21
lines changed Original file line number Diff line number Diff line change @@ -9,16 +9,6 @@ set(LIB_COMMON_DIR ${LIB_ANDROID_DIR}/../common/cpp)
99set (LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR} /build /generated /source /codegen/jni)
1010set (LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR} /react/renderer/components/${LIB_LITERAL} )
1111
12- add_compile_options (
13-   -fexceptions
14-   -frtti
15-   -std=c++20
16-   -Wall
17-   -Wpedantic
18-   -Wno-gnu-zero-variadic-macro-arguments
19-   -Wno-dollar-in-identifier-extension
20- )
21- 
2212file (GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp ${LIB_COMMON_DIR} /react/renderer/components/${LIB_LITERAL} /*.cpp)
2313file (GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_JNI_DIR} /*.cpp ${LIB_ANDROID_GENERATED_COMPONENTS_DIR} /*.cpp)
2414
@@ -69,19 +59,29 @@ else()
6959  )
7060endif ()
7161
72- 
73- target_compile_options (
74-   ${LIB_TARGET_NAME} 
75-   PRIVATE 
76-   -DLOG_TAG=\"ReactNative\"
77-   -fexceptions
78-   -frtti
79-   -std=c++20
80-   -Wall
81- )
82- 
8362target_include_directories (
8463  ${CMAKE_PROJECT_NAME} 
8564  PUBLIC 
8665  ${CMAKE_CURRENT_SOURCE_DIR} 
8766)
67+ 
68+ if (ReactAndroid_VERSION_MINOR GREATER_EQUAL  80)
69+   target_compile_reactnative_options(${LIB_TARGET_NAME}  PUBLIC )
70+ else ()
71+   target_compile_options (
72+     ${LIB_TARGET_NAME} 
73+     PRIVATE 
74+     -fexceptions
75+     -frtti
76+     -std=c++20
77+     -Wall
78+   )
79+ endif ()
80+ 
81+ target_compile_options (
82+   ${LIB_TARGET_NAME} 
83+   PRIVATE 
84+   -Wpedantic
85+   -Wno-gnu-zero-variadic-macro-arguments
86+   -Wno-dollar-in-identifier-extension
87+ )
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments