From 5aa2bf126066899bf29e1f11f40f0d013e808dd9 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Tue, 27 May 2025 02:51:05 -0700 Subject: [PATCH 1/2] Correctly propagate RN_SERIALIZABLE_STATE to 3rd party CMake targets Summary: RNTester Android is currently instacrashing in OSS due to 3rd-party packages not having the `RN_SERIALIZABLE_STATE` definition. That's because the `INTERFACE` definition is not properly propagated on the prefab boundaries. This was happening for `react-native-popup-menu-android` and `react-native-test-library` and will also happen for Codegen libraries. This fixes it. 3p developers with custom CMake files will also have to use the `target_compile_reactnative_options` functions to make sure the compilation flag are properly populated. Changelog: [Android] [Changed] - Correctly propagate RN_SERIALIZABLE_STATE to 3rd party CMake targets Differential Revision: D75441245 --- .../generators/modules/GenerateModuleJniH.js | 10 +- .../GenerateModuleJniH-test.js.snap | 110 ++---------------- .../android/src/main/jni/CMakeLists.txt | 10 +- .../android/src/main/jni/CMakeLists.txt | 10 +- .../ReactAndroid/src/main/jni/CMakeLists.txt | 75 ------------ .../cmake-utils/react-native-flags.cmake | 1 + .../react/renderer/core/CMakeLists.txt | 1 - 7 files changed, 15 insertions(+), 202 deletions(-) diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js index 5bd732a4bc1c1b..f62a16241df990 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js @@ -95,15 +95,7 @@ target_link_libraries( } ) -target_compile_options( - react_codegen_${libraryName} - PRIVATE - -DLOG_TAG=\\"ReactNative\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_${libraryName} PRIVATE) `; }; diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap index 3e015be8c93045..a45028176b143b 100644 --- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap +++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap @@ -61,15 +61,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_SampleWithUppercaseName - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_SampleWithUppercaseName PRIVATE) ", } `; @@ -135,15 +127,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_complex_objects - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_complex_objects PRIVATE) ", } `; @@ -202,15 +186,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_cxx_only_native_modules - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_cxx_only_native_modules PRIVATE) ", } `; @@ -276,15 +252,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_empty_native_modules - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_empty_native_modules PRIVATE) ", } `; @@ -350,15 +318,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_event_emitter_module - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_event_emitter_module PRIVATE) ", } `; @@ -424,15 +384,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_native_modules_with_type_aliases - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_native_modules_with_type_aliases PRIVATE) ", } `; @@ -506,15 +458,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_real_module_example - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_real_module_example PRIVATE) ", } `; @@ -580,15 +524,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_simple_native_modules - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_simple_native_modules PRIVATE) ", } `; @@ -654,15 +590,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_string_literals - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_string_literals PRIVATE) ", } `; @@ -736,15 +664,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_two_modules_different_files - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_two_modules_different_files PRIVATE) ", } `; @@ -810,15 +730,7 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_union_module - PRIVATE - -DLOG_TAG=\\\\\\"ReactNative\\\\\\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_union_module PRIVATE) ", } `; diff --git a/packages/react-native-popup-menu-android/android/src/main/jni/CMakeLists.txt b/packages/react-native-popup-menu-android/android/src/main/jni/CMakeLists.txt index 83cdeee185b980..7400d0796c8b12 100644 --- a/packages/react-native-popup-menu-android/android/src/main/jni/CMakeLists.txt +++ b/packages/react-native-popup-menu-android/android/src/main/jni/CMakeLists.txt @@ -23,12 +23,4 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_ReactPopupMenuAndroidSpecs - PRIVATE - -DLOG_TAG=\"ReactNative\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_ReactPopupMenuAndroidSpecs PRIVATE) diff --git a/packages/react-native-test-library/android/src/main/jni/CMakeLists.txt b/packages/react-native-test-library/android/src/main/jni/CMakeLists.txt index ec1561e81038ed..1d9a3091aefbf3 100644 --- a/packages/react-native-test-library/android/src/main/jni/CMakeLists.txt +++ b/packages/react-native-test-library/android/src/main/jni/CMakeLists.txt @@ -23,12 +23,4 @@ target_link_libraries( reactnative ) -target_compile_options( - react_codegen_OSSLibraryExampleSpec - PRIVATE - -DLOG_TAG=\"ReactNative\" - -fexceptions - -frtti - -std=c++20 - -Wall -) +target_compile_reactnative_options(react_codegen_OSSLibraryExampleSpec PRIVATE) diff --git a/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt index a00ce454de8484..4b562cb790d0e2 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt @@ -332,81 +332,6 @@ target_include_directories(reactnative $ ) -target_compile_definitions(reactnative - PUBLIC - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ -) - # GTest dependencies add_executable(reactnative_unittest ${REACT_COMMON_DIR}/cxxreact/tests/jsarg_helpers.cpp diff --git a/packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake b/packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake index 24c59d7a0e8ad5..f40c02967095f1 100644 --- a/packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake +++ b/packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake @@ -28,6 +28,7 @@ SET(reactnative_FLAGS function(target_compile_reactnative_options target_name scope) target_compile_options(${target_name} ${scope} ${reactnative_FLAGS}) + target_compile_definitions(${target_name} ${scope} RN_SERIALIZABLE_STATE) set (extra_args ${ARGN}) list(LENGTH extra_args extra_count) set (tag "ReactNative") diff --git a/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt index b40b3beb598869..ce90c7a8a97776 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt @@ -26,5 +26,4 @@ target_link_libraries(react_renderer_core react_utils runtimeexecutor) target_compile_reactnative_options(react_renderer_core PRIVATE "Fabric") -target_compile_definitions(react_renderer_core PUBLIC RN_SERIALIZABLE_STATE) target_compile_options(react_renderer_core PRIVATE -Wpedantic) From 79fb28217858242e7ac8cf219d1ba6e4bf68825c Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Tue, 27 May 2025 05:28:11 -0700 Subject: [PATCH 2/2] Cleanup custom LOG_TAG in our CMakeLists files. Summary: We currently support an optional 3rd params for `target_compile_reactnative_options` which allows to specify a LOG_TAG macro. No one is actually reading that Macro. The only usage would be logging from the Android SDK which we don't explicitely use. Here I'm updating our build to specify a LOG_TAG as `ReactNative` for all the targets without allowing to customize it as it just complicates our build setup. Changelog: [Internal] [Changed] - Differential Revision: D75445577 --- .../cmake-utils/ReactNative-application.cmake | 2 +- .../src/main/jni/react/devsupport/CMakeLists.txt | 2 +- .../src/main/jni/react/fabric/CMakeLists.txt | 2 +- .../src/main/jni/react/featureflags/CMakeLists.txt | 2 +- .../src/main/jni/react/mapbuffer/CMakeLists.txt | 2 +- .../src/main/jni/react/newarchdefaults/CMakeLists.txt | 2 +- .../src/main/jni/react/uimanager/CMakeLists.txt | 2 +- .../ReactCommon/cmake-utils/react-native-flags.cmake | 11 ++--------- .../react-native/ReactCommon/cxxreact/CMakeLists.txt | 2 +- packages/react-native/ReactCommon/jsc/CMakeLists.txt | 2 +- packages/react-native/ReactCommon/jsi/CMakeLists.txt | 2 +- .../ReactCommon/jsitooling/CMakeLists.txt | 2 +- .../ReactCommon/react/bridging/CMakeLists.txt | 2 +- .../ReactCommon/react/debug/CMakeLists.txt | 2 +- .../ReactCommon/react/featureflags/CMakeLists.txt | 2 +- .../react/nativemodule/core/CMakeLists.txt | 2 +- .../react/nativemodule/defaults/CMakeLists.txt | 2 +- .../devtoolsruntimesettings/CMakeLists.txt | 2 +- .../ReactCommon/react/nativemodule/dom/CMakeLists.txt | 2 +- .../react/nativemodule/featureflags/CMakeLists.txt | 2 +- .../react/nativemodule/idlecallbacks/CMakeLists.txt | 2 +- .../react/nativemodule/microtasks/CMakeLists.txt | 2 +- .../samples/platform/android/CMakeLists.txt | 2 +- .../react/performance/timeline/CMakeLists.txt | 2 +- .../react/renderer/animations/CMakeLists.txt | 2 +- .../react/renderer/attributedstring/CMakeLists.txt | 2 +- .../react/renderer/componentregistry/CMakeLists.txt | 2 +- .../renderer/componentregistry/native/CMakeLists.txt | 2 +- .../react/renderer/components/image/CMakeLists.txt | 2 +- .../legacyviewmanagerinterop/CMakeLists.txt | 2 +- .../react/renderer/components/modal/CMakeLists.txt | 2 +- .../renderer/components/progressbar/CMakeLists.txt | 2 +- .../react/renderer/components/root/CMakeLists.txt | 2 +- .../renderer/components/safeareaview/CMakeLists.txt | 2 +- .../renderer/components/scrollview/CMakeLists.txt | 2 +- .../react/renderer/components/switch/CMakeLists.txt | 2 +- .../react/renderer/components/text/CMakeLists.txt | 2 +- .../renderer/components/textinput/CMakeLists.txt | 2 +- .../components/unimplementedview/CMakeLists.txt | 2 +- .../react/renderer/components/view/CMakeLists.txt | 2 +- .../react/renderer/consistency/CMakeLists.txt | 2 +- .../ReactCommon/react/renderer/core/CMakeLists.txt | 2 +- .../ReactCommon/react/renderer/css/CMakeLists.txt | 4 ++-- .../ReactCommon/react/renderer/debug/CMakeLists.txt | 2 +- .../ReactCommon/react/renderer/dom/CMakeLists.txt | 2 +- .../ReactCommon/react/renderer/element/CMakeLists.txt | 2 +- .../react/renderer/graphics/CMakeLists.txt | 2 +- .../react/renderer/imagemanager/CMakeLists.txt | 2 +- .../react/renderer/leakchecker/CMakeLists.txt | 2 +- .../react/renderer/mapbuffer/CMakeLists.txt | 2 +- .../react/renderer/mounting/CMakeLists.txt | 2 +- .../react/renderer/observers/events/CMakeLists.txt | 2 +- .../react/renderer/runtimescheduler/CMakeLists.txt | 2 +- .../react/renderer/scheduler/CMakeLists.txt | 2 +- .../react/renderer/telemetry/CMakeLists.txt | 2 +- .../react/renderer/textlayoutmanager/CMakeLists.txt | 2 +- .../react/renderer/uimanager/CMakeLists.txt | 2 +- .../renderer/uimanager/consistency/CMakeLists.txt | 2 +- .../ReactCommon/react/runtime/hermes/CMakeLists.txt | 2 +- .../ReactCommon/react/utils/CMakeLists.txt | 2 +- .../rn-tester/NativeCxxModuleExample/CMakeLists.txt | 10 +--------- 61 files changed, 63 insertions(+), 78 deletions(-) diff --git a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake index d6881a5fee7fd6..baa0fefa95ec0b 100644 --- a/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake +++ b/packages/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake @@ -68,7 +68,7 @@ target_include_directories(${CMAKE_PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_BUILD_DIR}/generated/autolinking/src/main/jni) -target_compile_reactnative_options(${CMAKE_PROJECT_NAME} PRIVATE "ReactNative") +target_compile_reactnative_options(${CMAKE_PROJECT_NAME} PRIVATE) # Prefab packages from React Native find_package(ReactAndroid REQUIRED CONFIG) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/CMakeLists.txt index dc628158dfef49..8364037e15bb31 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/devsupport/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(react_devsupportjni fbjni jsinspector) -target_compile_reactnative_options(react_devsupportjni PRIVATE "ReactNative") +target_compile_reactnative_options(react_devsupportjni PRIVATE) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt index 9fa412e75783bf..bdef71c0d4a689 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CMakeLists.txt @@ -64,4 +64,4 @@ target_link_libraries( yoga ) -target_compile_reactnative_options(fabricjni PRIVATE "Fabric") +target_compile_reactnative_options(fabricjni PRIVATE) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/CMakeLists.txt index 114322733bf091..5fd94dd94387bc 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/featureflags/CMakeLists.txt @@ -26,4 +26,4 @@ target_link_libraries( ) target_merge_so(react_featureflagsjni) -target_compile_reactnative_options(react_featureflagsjni PRIVATE "ReactNative") +target_compile_reactnative_options(react_featureflagsjni PRIVATE) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt index 616f68e6badad4..167b2218093c75 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/CMakeLists.txt @@ -34,4 +34,4 @@ target_link_libraries(mapbufferjni yoga ) -target_compile_reactnative_options(mapbufferjni PRIVATE "Fabric") +target_compile_reactnative_options(mapbufferjni PRIVATE) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt index 0ef2ae5ee8075a..cf81e75c2028b6 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/CMakeLists.txt @@ -31,4 +31,4 @@ target_link_libraries(react_newarchdefaults react_nativemodule_idlecallbacks jsi) -target_compile_reactnative_options(react_newarchdefaults PRIVATE "ReactNative") +target_compile_reactnative_options(react_newarchdefaults PRIVATE) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt b/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt index 7b6eb3b9cdda00..5ae5008f12fd98 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt +++ b/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt @@ -36,4 +36,4 @@ target_link_libraries(uimanagerjni yoga ) -target_compile_reactnative_options(uimanagerjni PRIVATE "ReactNative") +target_compile_reactnative_options(uimanagerjni PRIVATE) diff --git a/packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake b/packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake index f40c02967095f1..bbbd534d9ad3ff 100644 --- a/packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake +++ b/packages/react-native/ReactCommon/cmake-utils/react-native-flags.cmake @@ -16,25 +16,18 @@ SET(reactnative_FLAGS -frtti -std=c++20 -DFOLLY_NO_CONFIG=1 + -DLOG_TAG=\"ReactNative\" ) # This function can be used to configure the reactnative flags for a specific target in # a conveniente way. The usage is: # -# target_compile_reactnative_options(target_name scope [tag]) +# target_compile_reactnative_options(target_name scope) # # scope is either PUBLIC, PRIVATE or INTERFACE -# tag is optional and if set, will be passed to the -DLOG_TAG flag function(target_compile_reactnative_options target_name scope) target_compile_options(${target_name} ${scope} ${reactnative_FLAGS}) target_compile_definitions(${target_name} ${scope} RN_SERIALIZABLE_STATE) - set (extra_args ${ARGN}) - list(LENGTH extra_args extra_count) - set (tag "ReactNative") - if (${extra_count} GREATER 0) - list(GET extra_args 0 user_provided_tag) - target_compile_options(${target_name} ${scope} -DLOG_TAG=\"${user_provided_tag}\") - endif () endfunction() diff --git a/packages/react-native/ReactCommon/cxxreact/CMakeLists.txt b/packages/react-native/ReactCommon/cxxreact/CMakeLists.txt index 55f06ad85ae37b..1c57f04949cca3 100644 --- a/packages/react-native/ReactCommon/cxxreact/CMakeLists.txt +++ b/packages/react-native/ReactCommon/cxxreact/CMakeLists.txt @@ -25,5 +25,5 @@ target_link_libraries(react_cxxreact runtimeexecutor react_debug) -target_compile_reactnative_options(react_cxxreact PRIVATE "ReactNative") +target_compile_reactnative_options(react_cxxreact PRIVATE) target_compile_options(react_cxxreact PRIVATE -Wno-unused-lambda-capture) diff --git a/packages/react-native/ReactCommon/jsc/CMakeLists.txt b/packages/react-native/ReactCommon/jsc/CMakeLists.txt index ef85423decd776..e1a07988638dfd 100644 --- a/packages/react-native/ReactCommon/jsc/CMakeLists.txt +++ b/packages/react-native/ReactCommon/jsc/CMakeLists.txt @@ -30,5 +30,5 @@ if(NOT ${CMAKE_BUILD_TYPE} MATCHES Debug) target_compile_options(jscruntime PRIVATE -DNDEBUG) endif() -target_compile_reactnative_options(jscruntime PRIVATE "ReactNative") +target_compile_reactnative_options(jscruntime PRIVATE) target_compile_options(jscruntime PRIVATE -O3 -Wno-unused-lambda-capture) diff --git a/packages/react-native/ReactCommon/jsi/CMakeLists.txt b/packages/react-native/ReactCommon/jsi/CMakeLists.txt index 3a272556903f77..dd40f23ec5ac23 100644 --- a/packages/react-native/ReactCommon/jsi/CMakeLists.txt +++ b/packages/react-native/ReactCommon/jsi/CMakeLists.txt @@ -22,5 +22,5 @@ target_link_libraries(jsi folly_runtime glog) -target_compile_reactnative_options(jsi PRIVATE "ReactNative") +target_compile_reactnative_options(jsi PRIVATE) target_compile_options(jsi PRIVATE -O3 -Wno-unused-lambda-capture) diff --git a/packages/react-native/ReactCommon/jsitooling/CMakeLists.txt b/packages/react-native/ReactCommon/jsitooling/CMakeLists.txt index 40be92a7c7c1a0..565f832b39df6e 100644 --- a/packages/react-native/ReactCommon/jsitooling/CMakeLists.txt +++ b/packages/react-native/ReactCommon/jsitooling/CMakeLists.txt @@ -22,5 +22,5 @@ target_link_libraries(jsitooling glog jsi) -target_compile_reactnative_options(jsitooling PRIVATE "ReactNative") +target_compile_reactnative_options(jsitooling PRIVATE) target_compile_options(jsitooling PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/bridging/CMakeLists.txt b/packages/react-native/ReactCommon/react/bridging/CMakeLists.txt index 39f8b9c65dde89..3e5fc47830b850 100644 --- a/packages/react-native/ReactCommon/react/bridging/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/bridging/CMakeLists.txt @@ -15,5 +15,5 @@ add_library(react_bridging OBJECT ${react_bridging_SRC}) target_include_directories(react_bridging PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_bridging jsi callinvoker react_timing) -target_compile_reactnative_options(react_bridging PRIVATE "ReactNative") +target_compile_reactnative_options(react_bridging PRIVATE) target_compile_options(react_bridging PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/debug/CMakeLists.txt b/packages/react-native/ReactCommon/react/debug/CMakeLists.txt index a564c68e6393fb..7af605b2b6a48e 100644 --- a/packages/react-native/ReactCommon/react/debug/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/debug/CMakeLists.txt @@ -15,7 +15,7 @@ target_include_directories(react_debug PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_debug log folly_runtime) -target_compile_reactnative_options(react_debug PRIVATE "Fabric") +target_compile_reactnative_options(react_debug PRIVATE) target_compile_options(react_debug PRIVATE -Wpedantic) if(NOT ${CMAKE_BUILD_TYPE} MATCHES Debug) target_compile_options(react_debug PUBLIC -DNDEBUG) diff --git a/packages/react-native/ReactCommon/react/featureflags/CMakeLists.txt b/packages/react-native/ReactCommon/react/featureflags/CMakeLists.txt index 5b329d327513b3..110b45d41b06ed 100644 --- a/packages/react-native/ReactCommon/react/featureflags/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/featureflags/CMakeLists.txt @@ -14,5 +14,5 @@ add_library(react_featureflags OBJECT ${react_featureflags_SRC}) target_include_directories(react_featureflags PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_featureflags folly_runtime) -target_compile_reactnative_options(react_featureflags PRIVATE "ReactNative") +target_compile_reactnative_options(react_featureflags PRIVATE) target_compile_options(react_featureflags PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/core/CMakeLists.txt index 43b4e5ef765587..7f7491b9599d27 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/core/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries(react_nativemodule_core react_featureflags reactperflogger reactnativejni) -target_compile_reactnative_options(react_nativemodule_core PRIVATE "ReactNative") +target_compile_reactnative_options(react_nativemodule_core PRIVATE) target_compile_options(react_nativemodule_core PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/nativemodule/defaults/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/defaults/CMakeLists.txt index b291e07068ced7..1b495bac400af3 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/defaults/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/defaults/CMakeLists.txt @@ -20,5 +20,5 @@ target_link_libraries(react_nativemodule_defaults react_nativemodule_microtasks react_nativemodule_idlecallbacks ) -target_compile_reactnative_options(react_nativemodule_defaults PRIVATE "ReactNative") +target_compile_reactnative_options(react_nativemodule_defaults PRIVATE) target_compile_options(react_nativemodule_defaults PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt index 997b4a503a6e49..8666ad0080fd3d 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt @@ -16,5 +16,5 @@ target_include_directories(react_nativemodule_devtoolsruntimesettings PUBLIC ${R target_link_libraries(react_nativemodule_devtoolsruntimesettings react_devtoolsruntimesettingscxx ) -target_compile_reactnative_options(react_nativemodule_devtoolsruntimesettings PRIVATE "ReactNative") +target_compile_reactnative_options(react_nativemodule_devtoolsruntimesettings PRIVATE) target_compile_options(react_nativemodule_devtoolsruntimesettings PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/nativemodule/dom/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/dom/CMakeLists.txt index 5bbc31c6db040b..25927e0af93387 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/dom/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/dom/CMakeLists.txt @@ -24,5 +24,5 @@ target_link_libraries(react_nativemodule_dom react_renderer_dom react_renderer_uimanager ) -target_compile_reactnative_options(react_nativemodule_dom PRIVATE "ReactNative") +target_compile_reactnative_options(react_nativemodule_dom PRIVATE) target_compile_options(react_nativemodule_dom PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/nativemodule/featureflags/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/featureflags/CMakeLists.txt index ea3e176997b29c..f119a3a9297859 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/featureflags/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/featureflags/CMakeLists.txt @@ -18,5 +18,5 @@ target_link_libraries(react_nativemodule_featureflags react_cxxreact react_featureflags ) -target_compile_reactnative_options(react_nativemodule_featureflags PRIVATE "ReactNative") +target_compile_reactnative_options(react_nativemodule_featureflags PRIVATE) target_compile_options(react_nativemodule_featureflags PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/CMakeLists.txt index 788c0d0af7d02e..4114bb58198992 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/idlecallbacks/CMakeLists.txt @@ -17,5 +17,5 @@ target_link_libraries(react_nativemodule_idlecallbacks react_cxxreact react_renderer_runtimescheduler ) -target_compile_reactnative_options(react_nativemodule_idlecallbacks PRIVATE "ReactNative") +target_compile_reactnative_options(react_nativemodule_idlecallbacks PRIVATE) target_compile_options(react_nativemodule_idlecallbacks PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/nativemodule/microtasks/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/microtasks/CMakeLists.txt index 295a3c6e664ee2..42bb6672d445b8 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/microtasks/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/microtasks/CMakeLists.txt @@ -17,5 +17,5 @@ target_link_libraries(react_nativemodule_microtasks react_codegen_rncore react_cxxreact ) -target_compile_reactnative_options(react_nativemodule_microtasks PRIVATE "ReactNative") +target_compile_reactnative_options(react_nativemodule_microtasks PRIVATE) target_compile_options(react_nativemodule_microtasks PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt index be23bff562da57..af0bfa80c5371b 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/CMakeLists.txt @@ -19,5 +19,5 @@ target_link_libraries(sampleturbomodule reactnative ) -target_compile_reactnative_options(sampleturbomodule PRIVATE "ReactNative") +target_compile_reactnative_options(sampleturbomodule PRIVATE) target_compile_options(sampleturbomodule PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/performance/timeline/CMakeLists.txt b/packages/react-native/ReactCommon/react/performance/timeline/CMakeLists.txt index 4de6a14a509859..4250fb241c32d8 100644 --- a/packages/react-native/ReactCommon/react/performance/timeline/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/performance/timeline/CMakeLists.txt @@ -11,7 +11,7 @@ include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake) file(GLOB react_performance_timeline_SRC CONFIGURE_DEPENDS *.cpp) add_library(react_performance_timeline OBJECT ${react_performance_timeline_SRC}) -target_compile_reactnative_options(react_performance_timeline PRIVATE "ReactNative") +target_compile_reactnative_options(react_performance_timeline PRIVATE) target_compile_options(react_performance_timeline PRIVATE -Wpedantic) target_include_directories(react_performance_timeline PUBLIC ${REACT_COMMON_DIR}) diff --git a/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt index 19e7b5ec4fe1da..a29c773ca89121 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/animations/CMakeLists.txt @@ -29,5 +29,5 @@ target_link_libraries(react_renderer_animations runtimeexecutor yoga ) -target_compile_reactnative_options(react_renderer_animations PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_animations PRIVATE) target_compile_options(react_renderer_animations PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/attributedstring/CMakeLists.txt index b7243d6d006e08..47784a726f2a74 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/CMakeLists.txt @@ -27,5 +27,5 @@ target_link_libraries(react_renderer_attributedstring rrc_view yoga ) -target_compile_reactnative_options(react_renderer_attributedstring PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_attributedstring PRIVATE) target_compile_options(react_renderer_attributedstring PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/componentregistry/CMakeLists.txt index 3a08926d708b40..3f96765a2e497e 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/CMakeLists.txt @@ -23,5 +23,5 @@ target_link_libraries(react_renderer_componentregistry react_utils rrc_legacyviewmanagerinterop ) -target_compile_reactnative_options(react_renderer_componentregistry PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_componentregistry PRIVATE) target_compile_options(react_renderer_componentregistry PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt index afa42ece16a6e3..249493f0cce772 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/native/CMakeLists.txt @@ -23,5 +23,5 @@ target_link_libraries(rrc_native react_utils callinvoker ) -target_compile_reactnative_options(rrc_native PRIVATE "Fabric") +target_compile_reactnative_options(rrc_native PRIVATE) target_compile_options(rrc_native PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/image/CMakeLists.txt index 9ca149c335a297..6babcc158ad19f 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/image/CMakeLists.txt @@ -28,5 +28,5 @@ target_link_libraries(rrc_image rrc_view yoga ) -target_compile_reactnative_options(rrc_image PRIVATE "Fabric") +target_compile_reactnative_options(rrc_image PRIVATE) target_compile_options(rrc_image PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/CMakeLists.txt index 92a3072c76b249..7e77dff9411e02 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/CMakeLists.txt @@ -22,5 +22,5 @@ target_link_libraries(rrc_legacyviewmanagerinterop rrc_view yoga ) -target_compile_reactnative_options(rrc_legacyviewmanagerinterop PRIVATE "Fabric") +target_compile_reactnative_options(rrc_legacyviewmanagerinterop PRIVATE) target_compile_options(rrc_legacyviewmanagerinterop PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/modal/CMakeLists.txt index 575329650dd975..a996222eadced3 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/modal/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/modal/CMakeLists.txt @@ -28,5 +28,5 @@ target_link_libraries(rrc_modal rrc_view yoga ) -target_compile_reactnative_options(rrc_modal PRIVATE "Fabric") +target_compile_reactnative_options(rrc_modal PRIVATE) target_compile_options(rrc_modal PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt index c5e40c645b0fda..fee751a8edd500 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries(rrc_progressbar rrc_view yoga ) -target_compile_reactnative_options(rrc_progressbar PRIVATE "Fabric") +target_compile_reactnative_options(rrc_progressbar PRIVATE) target_compile_options(rrc_progressbar PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/root/CMakeLists.txt index 0bee53cf2f98ac..4d334c6621265d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/root/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/root/CMakeLists.txt @@ -24,5 +24,5 @@ target_link_libraries(rrc_root rrc_view yoga ) -target_compile_reactnative_options(rrc_root PRIVATE "Fabric") +target_compile_reactnative_options(rrc_root PRIVATE) target_compile_options(rrc_root PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/safeareaview/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/safeareaview/CMakeLists.txt index 04a339fe0c47c1..c32e40803c69c7 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/safeareaview/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/safeareaview/CMakeLists.txt @@ -36,5 +36,5 @@ target_link_libraries( yoga ) -target_compile_reactnative_options(rrc_safeareaview PRIVATE "Fabric") +target_compile_reactnative_options(rrc_safeareaview PRIVATE) target_compile_options(rrc_safeareaview PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt index 88188e50c2b267..fcb339f13cf5c1 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/CMakeLists.txt @@ -29,5 +29,5 @@ target_link_libraries(rrc_scrollview rrc_view yoga ) -target_compile_reactnative_options(rrc_scrollview PRIVATE "Fabric") +target_compile_reactnative_options(rrc_scrollview PRIVATE) target_compile_options(rrc_scrollview PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/switch/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/switch/CMakeLists.txt index dd8d86f70c27fa..957405c434ebf0 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/switch/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/switch/CMakeLists.txt @@ -35,5 +35,5 @@ target_link_libraries( yoga ) -target_compile_reactnative_options(rrc_switch PRIVATE "Fabric") +target_compile_reactnative_options(rrc_switch PRIVATE) target_compile_options(rrc_switch PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/text/CMakeLists.txt index 506d781264c3cc..a623d8ac778554 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/text/CMakeLists.txt @@ -38,5 +38,5 @@ target_link_libraries(rrc_text rrc_view yoga ) -target_compile_reactnative_options(rrc_text PRIVATE "Fabric") +target_compile_reactnative_options(rrc_text PRIVATE) target_compile_options(rrc_text PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/textinput/CMakeLists.txt index 232b650909ca47..13cc489fb6e52d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/CMakeLists.txt @@ -35,5 +35,5 @@ target_link_libraries(rrc_textinput rrc_view yoga ) -target_compile_reactnative_options(rrc_textinput PRIVATE "Fabric") +target_compile_reactnative_options(rrc_textinput PRIVATE) target_compile_options(rrc_textinput PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt index 758780650153f5..3909a34fd70aec 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt @@ -25,5 +25,5 @@ target_link_libraries(rrc_unimplementedview rrc_view yoga ) -target_compile_reactnative_options(rrc_unimplementedview PRIVATE "Fabric") +target_compile_reactnative_options(rrc_unimplementedview PRIVATE) target_compile_options(rrc_unimplementedview PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt index 8ff074c0a05d71..bb0695d37aa608 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries(rrc_view react_renderer_debug react_renderer_graphics yoga) -target_compile_reactnative_options(rrc_view PRIVATE "Fabric") +target_compile_reactnative_options(rrc_view PRIVATE) target_compile_options(rrc_view PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/consistency/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/consistency/CMakeLists.txt index 7f6b8cea147216..9f42cf6f800cb8 100644 --- a/packages/react-native/ReactCommon/react/renderer/consistency/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/consistency/CMakeLists.txt @@ -12,5 +12,5 @@ file(GLOB react_renderer_consistency_SRC CONFIGURE_DEPENDS *.cpp) add_library(react_renderer_consistency OBJECT ${react_renderer_consistency_SRC}) target_include_directories(react_renderer_consistency PUBLIC ${REACT_COMMON_DIR}) -target_compile_reactnative_options(react_renderer_consistency PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_consistency PRIVATE) target_compile_options(react_renderer_consistency PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt index ce90c7a8a97776..e1e0984d3e830e 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt @@ -25,5 +25,5 @@ target_link_libraries(react_renderer_core react_renderer_runtimescheduler react_utils runtimeexecutor) -target_compile_reactnative_options(react_renderer_core PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_core PRIVATE) target_compile_options(react_renderer_core PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/css/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/css/CMakeLists.txt index 040e5ce23c3e4e..37f588e6bff93a 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/css/CMakeLists.txt @@ -20,7 +20,7 @@ if("${react_renderer_css_SRC}" STREQUAL "") glog react_debug react_utils) - target_compile_reactnative_options(react_renderer_css INTERFACE "Fabric") + target_compile_reactnative_options(react_renderer_css INTERFACE) target_compile_options(react_renderer_css INTERFACE -Wpedantic) else() add_library(react_renderer_css OBJECT ${react_renderer_css_SRC}) @@ -31,6 +31,6 @@ else() glog react_debug react_utils) - target_compile_reactnative_options(react_renderer_css PRIVATE "Fabric") + target_compile_reactnative_options(react_renderer_css PRIVATE) target_compile_options(react_renderer_css PRIVATE -Wpedantic) endif() diff --git a/packages/react-native/ReactCommon/react/renderer/debug/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/debug/CMakeLists.txt index 38ede4871512f1..165a79e5c53f2a 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/debug/CMakeLists.txt @@ -13,5 +13,5 @@ add_library(react_renderer_debug OBJECT ${react_renderer_debug_SRC}) target_include_directories(react_renderer_debug PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_renderer_debug folly_runtime react_debug) -target_compile_reactnative_options(react_renderer_debug PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_debug PRIVATE) target_compile_options(react_renderer_debug PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/dom/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/dom/CMakeLists.txt index 3dddfd5761841c..b55103de39eae7 100644 --- a/packages/react-native/ReactCommon/react/renderer/dom/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/dom/CMakeLists.txt @@ -18,5 +18,5 @@ target_link_libraries(react_renderer_dom react_renderer_graphics rrc_root rrc_text) -target_compile_reactnative_options(react_renderer_dom PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_dom PRIVATE) target_compile_options(react_renderer_dom PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/element/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/element/CMakeLists.txt index e3d4d82e3fd956..ead1c1a234acfd 100644 --- a/packages/react-native/ReactCommon/react/renderer/element/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/element/CMakeLists.txt @@ -19,5 +19,5 @@ target_link_libraries(react_renderer_element react_renderer_core react_renderer_componentregistry ) -target_compile_reactnative_options(react_renderer_element PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_element PRIVATE) target_compile_options(react_renderer_element PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt index 0f327097c602e4..605790d5db5287 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/graphics/CMakeLists.txt @@ -24,5 +24,5 @@ target_link_libraries(react_renderer_graphics react_debug react_utils ) -target_compile_reactnative_options(react_renderer_graphics PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_graphics PRIVATE) target_compile_options(react_renderer_graphics PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/imagemanager/CMakeLists.txt index caa467ed4fb784..6ae5760bba143f 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/CMakeLists.txt @@ -34,5 +34,5 @@ target_link_libraries(react_renderer_imagemanager react_renderer_mounting reactnativejni yoga) -target_compile_reactnative_options(react_renderer_imagemanager PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_imagemanager PRIVATE) target_compile_options(react_renderer_imagemanager PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/leakchecker/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/leakchecker/CMakeLists.txt index 90b086b3fc350d..bf2345dfeda6fe 100644 --- a/packages/react-native/ReactCommon/react/renderer/leakchecker/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/leakchecker/CMakeLists.txt @@ -16,5 +16,5 @@ target_link_libraries(react_renderer_leakchecker glog react_renderer_core runtimeexecutor) -target_compile_reactnative_options(react_renderer_leakchecker PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_leakchecker PRIVATE) target_compile_options(react_renderer_leakchecker PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt index 8a46ad7ed4190d..0930ec9ee1b2bc 100644 --- a/packages/react-native/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt @@ -12,5 +12,5 @@ add_library(react_renderer_mapbuffer OBJECT ${react_renderer_mapbuffer_SRC}) target_include_directories(react_renderer_mapbuffer PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_renderer_mapbuffer glog glog_init react_debug) -target_compile_reactnative_options(react_renderer_mapbuffer PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_mapbuffer PRIVATE) target_compile_options(react_renderer_mapbuffer PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt index 8b40e7c5a0ce49..eefd67c9f21ac6 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries(react_renderer_mounting rrc_view rrc_scrollview yoga) -target_compile_reactnative_options(react_renderer_mounting PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_mounting PRIVATE) target_compile_options(react_renderer_mounting PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/observers/events/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/observers/events/CMakeLists.txt index b50aaa2835798d..02dcd45a190e9d 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/events/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/observers/events/CMakeLists.txt @@ -21,5 +21,5 @@ target_link_libraries(react_renderer_observers_events react_featureflags react_renderer_uimanager react_utils) -target_compile_reactnative_options(react_renderer_observers_events PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_observers_events PRIVATE) target_compile_options(react_renderer_observers_events PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt index e3432de1366171..30d11bacb3a8c4 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/CMakeLists.txt @@ -25,5 +25,5 @@ target_link_libraries(react_renderer_runtimescheduler react_featureflags runtimeexecutor jsinspector_tracing) -target_compile_reactnative_options(react_renderer_runtimescheduler PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_runtimescheduler PRIVATE) target_compile_options(react_renderer_runtimescheduler PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt index 83c25b3f918c3c..2402045eb5fd10 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/CMakeLists.txt @@ -33,5 +33,5 @@ target_link_libraries(react_renderer_scheduler rrc_view yoga ) -target_compile_reactnative_options(react_renderer_scheduler PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_scheduler PRIVATE) target_compile_options(react_renderer_scheduler PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/telemetry/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/telemetry/CMakeLists.txt index b9735207a8c2d3..0954fe41f575f4 100644 --- a/packages/react-native/ReactCommon/react/renderer/telemetry/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/telemetry/CMakeLists.txt @@ -24,5 +24,5 @@ target_link_libraries(react_renderer_telemetry rrc_root rrc_view yoga) -target_compile_reactnative_options(react_renderer_telemetry PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_telemetry PRIVATE) target_compile_options(react_renderer_telemetry PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt index 2c00b1e0907e50..1218c7d44fa78a 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt @@ -41,5 +41,5 @@ target_link_libraries(react_renderer_textlayoutmanager reactnativejni yoga ) -target_compile_reactnative_options(react_renderer_textlayoutmanager PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_textlayoutmanager PRIVATE) target_compile_options(react_renderer_textlayoutmanager PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt index f956d8bcb07a2f..e130d05bf3c37e 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/CMakeLists.txt @@ -34,6 +34,6 @@ target_link_libraries(react_renderer_uimanager rrc_view runtimeexecutor ) -target_compile_reactnative_options(react_renderer_uimanager PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_uimanager PRIVATE) target_compile_options(react_renderer_uimanager PRIVATE -Wno-unused-local-typedef) target_compile_options(react_renderer_uimanager PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/consistency/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/uimanager/consistency/CMakeLists.txt index 05b0cd91706bba..e8673f3de72f7f 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/consistency/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/consistency/CMakeLists.txt @@ -18,5 +18,5 @@ target_link_libraries(react_renderer_uimanager_consistency rrc_root react_renderer_consistency react_renderer_mounting) -target_compile_reactnative_options(react_renderer_uimanager_consistency PRIVATE "Fabric") +target_compile_reactnative_options(react_renderer_uimanager_consistency PRIVATE) target_compile_options(react_renderer_uimanager_consistency PRIVATE -Wpedantic) diff --git a/packages/react-native/ReactCommon/react/runtime/hermes/CMakeLists.txt b/packages/react-native/ReactCommon/react/runtime/hermes/CMakeLists.txt index afab473264bf8f..bfdf0d39df9ee5 100644 --- a/packages/react-native/ReactCommon/react/runtime/hermes/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/runtime/hermes/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(bridgelesshermes reactnative ) -target_compile_reactnative_options(bridgelesshermes PRIVATE "Fabric") +target_compile_reactnative_options(bridgelesshermes PRIVATE) if(${CMAKE_BUILD_TYPE} MATCHES Debug) target_compile_options( bridgelesshermes diff --git a/packages/react-native/ReactCommon/react/utils/CMakeLists.txt b/packages/react-native/ReactCommon/react/utils/CMakeLists.txt index 89410f2dafa0c6..ed4279aa051f69 100644 --- a/packages/react-native/ReactCommon/react/utils/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/utils/CMakeLists.txt @@ -22,5 +22,5 @@ target_link_libraries(react_utils glog_init jsireact react_debug) -target_compile_reactnative_options(react_utils PRIVATE "Fabric") +target_compile_reactnative_options(react_utils PRIVATE) target_compile_options(react_utils PRIVATE -Wpedantic) diff --git a/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt b/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt index 8ac742cda5d0d6..422777aa5f6476 100644 --- a/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt +++ b/packages/rn-tester/NativeCxxModuleExample/CMakeLists.txt @@ -6,19 +6,11 @@ cmake_minimum_required(VERSION 3.13) set(CMAKE_VERBOSE_MAKEFILE on) -add_compile_options( - -fexceptions - -frtti - -std=c++20 - -Wall - -Wpedantic - -DFOLLY_NO_CONFIG=1 - -DLOG_TAG=\"ReactNative\") - file(GLOB nativecxxmoduleexample_SRC CONFIGURE_DEPENDS *.cpp) add_library(nativecxxmoduleexample STATIC ${nativecxxmoduleexample_SRC}) target_include_directories(nativecxxmoduleexample PUBLIC .) +target_compile_reactnative_options(nativecxxmoduleexample PRIVATE) target_link_libraries(nativecxxmoduleexample fbjni