Skip to content

Commit 832f368

Browse files
j-piaseckifacebook-github-bot
authored andcommitted
Resolve umbrella headers in CMake builds
Summary: The `React/*.h` umbrella headers for `react/renderer/components/view`, `react/debug` and `react/renderer/mapbuffer` are exported by every build system except CMake, so `#include <React/View.h>`, `<React/Debug.h>` and `<React/MapBuffer.h>` fail to resolve there. Add the missing `target_include_directories(<target> INTERFACE ...)` entry to each module, matching what the other umbrella-exporting modules already do. Changelog: [Android][Fixed] - Make the `React/View.h`, `React/Debug.h` and `React/MapBuffer.h` umbrella headers resolvable in CMake builds Differential Revision: D119662087
1 parent 8480b86 commit 832f368

3 files changed

Lines changed: 3 additions & 0 deletions

File tree

‎packages/react-native/ReactCommon/react/debug/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ file(GLOB react_debug_redbox_SRC CONFIGURE_DEPENDS redbox/*.cpp)
1313
add_library(react_debug OBJECT ${react_debug_SRC} ${react_debug_redbox_SRC})
1414

1515
target_include_directories(react_debug PUBLIC ${REACT_COMMON_DIR})
16+
target_include_directories(react_debug INTERFACE ${REACT_COMMON_DIR}/react/debug)
1617

1718
target_link_libraries(react_debug folly_runtime react_cxxstableapi)
1819

‎packages/react-native/ReactCommon/react/renderer/components/view/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ react_native_android_selector(platform_DIR
2323
${CMAKE_CURRENT_SOURCE_DIR}/platform/android/
2424
${CMAKE_CURRENT_SOURCE_DIR}/platform/cxx/)
2525
target_include_directories(rrc_view PUBLIC ${REACT_COMMON_DIR} ${platform_DIR})
26+
target_include_directories(rrc_view INTERFACE ${REACT_COMMON_DIR}/react/renderer/components/view)
2627

2728
target_link_libraries(rrc_view
2829
folly_runtime

‎packages/react-native/ReactCommon/react/renderer/mapbuffer/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ file(GLOB react_renderer_mapbuffer_SRC CONFIGURE_DEPENDS *.cpp)
1111
add_library(react_renderer_mapbuffer OBJECT ${react_renderer_mapbuffer_SRC})
1212

1313
target_include_directories(react_renderer_mapbuffer PUBLIC ${REACT_COMMON_DIR})
14+
target_include_directories(react_renderer_mapbuffer INTERFACE ${REACT_COMMON_DIR}/react/renderer/mapbuffer)
1415
target_link_libraries(react_renderer_mapbuffer glog glog_init react_cxxstableapi react_debug)
1516
target_compile_reactnative_options(react_renderer_mapbuffer PRIVATE)
1617
target_compile_options(react_renderer_mapbuffer PRIVATE -Wpedantic)

0 commit comments

Comments
 (0)