diff --git a/packages/react-native/ReactCommon/devtoolsruntimesettings/CMakeLists.txt b/packages/react-native/ReactCommon/devtoolsruntimesettings/CMakeLists.txt index 3be3a96bedd..1585b1dea0e 100644 --- a/packages/react-native/ReactCommon/devtoolsruntimesettings/CMakeLists.txt +++ b/packages/react-native/ReactCommon/devtoolsruntimesettings/CMakeLists.txt @@ -8,10 +8,10 @@ set(CMAKE_VERBOSE_MAKEFILE on) include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake) -add_library(react_devtoolsruntimesettingscxx INTERFACE) +file(GLOB devtoolsruntimesettings_SRCS *.cpp) +add_library(devtoolsruntimesettings OBJECT ${devtoolsruntimesettings_SRCS}) -target_include_directories(react_devtoolsruntimesettingscxx INTERFACE .) +target_include_directories(devtoolsruntimesettings PUBLIC .) -target_link_libraries(react_devtoolsruntimesettingscxx jsi) -target_compile_reactnative_options(react_devtoolsruntimesettingscxx PRIVATE) -target_compile_options(react_devtoolsruntimesettingscxx PRIVATE -Wpedantic) +target_link_libraries(devtoolsruntimesettings jsi react_codegen_rncore) +target_compile_reactnative_options(devtoolsruntimesettings PRIVATE) diff --git a/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt b/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt index 8666ad0080f..dc4e1497c4e 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt @@ -14,7 +14,7 @@ add_library(react_nativemodule_devtoolsruntimesettings OBJECT ${react_nativemodu target_include_directories(react_nativemodule_devtoolsruntimesettings PUBLIC ${REACT_COMMON_DIR}) target_link_libraries(react_nativemodule_devtoolsruntimesettings - react_devtoolsruntimesettingscxx + devtoolsruntimesettings ) 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/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.cpp b/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.cpp index 4b0e5ca0bd2..eac8accbe97 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.cpp @@ -6,7 +6,9 @@ */ #include "DevToolsRuntimeSettingsModule.h" +#if RN_DISABLE_OSS_PLUGIN_HEADER #include "Plugins.h" +#endif std::shared_ptr ReactDevToolsRuntimeSettingsModuleProvider( diff --git a/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.h b/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.h index 6f4d54aeb1c..ef674bcef30 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.h @@ -7,7 +7,7 @@ #pragma once -#include "devtoolsruntimesettingscxx/DevToolsRuntimeSettings.h" +#include namespace facebook::react {