Skip to content

Commit 5406180

Browse files
andrewdacenkofacebook-github-bot
authored andcommitted
Fix cmake build for devtoolsruntimesettings
Summary: Changelog: [Internal] Fix devtoolsruntimesettings lib as it needs to be OBJECT library as it has source code included. Differential Revision: D77035122
1 parent a94ae3f commit 5406180

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

packages/react-native/ReactCommon/devtoolsruntimesettings/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ set(CMAKE_VERBOSE_MAKEFILE on)
88

99
include(${REACT_COMMON_DIR}/cmake-utils/react-native-flags.cmake)
1010

11-
add_library(react_devtoolsruntimesettingscxx INTERFACE)
11+
file(GLOB devtoolsruntimesettings_SRCS *.cpp)
12+
add_library(devtoolsruntimesettings OBJECT ${devtoolsruntimesettings_SRCS})
1213

13-
target_include_directories(react_devtoolsruntimesettingscxx INTERFACE .)
14+
target_include_directories(devtoolsruntimesettings PUBLIC .)
1415

15-
target_link_libraries(react_devtoolsruntimesettingscxx jsi)
16-
target_compile_reactnative_options(react_devtoolsruntimesettingscxx PRIVATE)
17-
target_compile_options(react_devtoolsruntimesettingscxx PRIVATE -Wpedantic)
16+
target_link_libraries(devtoolsruntimesettings jsi react_codegen_rncore)
17+
target_compile_reactnative_options(devtoolsruntimesettings PRIVATE)

packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ add_library(react_nativemodule_devtoolsruntimesettings OBJECT ${react_nativemodu
1414
target_include_directories(react_nativemodule_devtoolsruntimesettings PUBLIC ${REACT_COMMON_DIR})
1515

1616
target_link_libraries(react_nativemodule_devtoolsruntimesettings
17-
react_devtoolsruntimesettingscxx
17+
devtoolsruntimesettings
1818
)
1919
target_compile_reactnative_options(react_nativemodule_devtoolsruntimesettings PRIVATE)
2020
target_compile_options(react_nativemodule_devtoolsruntimesettings PRIVATE -Wpedantic)

packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
*/
77

88
#include "DevToolsRuntimeSettingsModule.h"
9+
#if RN_DISABLE_OSS_PLUGIN_HEADER
910
#include "Plugins.h"
11+
#endif
1012

1113
std::shared_ptr<facebook::react::TurboModule>
1214
ReactDevToolsRuntimeSettingsModuleProvider(

packages/react-native/ReactCommon/react/nativemodule/devtoolsruntimesettings/DevToolsRuntimeSettingsModule.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#pragma once
99

10-
#include "devtoolsruntimesettingscxx/DevToolsRuntimeSettings.h"
10+
#include <devtoolsruntimesettings/DevToolsRuntimeSettings.h>
1111

1212
namespace facebook::react {
1313

0 commit comments

Comments
 (0)