Skip to content

Commit d44f48a

Browse files
dmytrorykunfacebook-github-bot
authored andcommitted
Unify BUCK and CMake includes for Cxx modules (facebook#43148)
Summary: This diff adds the `react/renderer/components` prefix to the generated `CMakeLists.txt` file for the Cxx modules. This will allow to import the generated JSI header also like this ``` #include <MyModule/MyModuleJSI.h> ``` and not just like this ``` #include "MyModuleJSI.h" ``` This will make CMake includes consistent with BUCK includes, and we'll reduce the number of awkward ifdefs in the include section. Changelog: [General][Changed] - Unify BUCK and CMake includes for Cxx modules. Differential Revision: D54063743
1 parent f45dd4c commit d44f48a

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ add_library(
8080
\${react_codegen_SRCS}
8181
)
8282
83-
target_include_directories(react_codegen_${libraryName} PUBLIC . react/renderer/components/${libraryName})
83+
target_include_directories(react_codegen_${libraryName} PUBLIC . react/renderer/components react/renderer/components/${libraryName})
8484
8585
target_link_libraries(
8686
react_codegen_${libraryName}

packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap

+8-8
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ add_library(
5050
\${react_codegen_SRCS}
5151
)
5252
53-
target_include_directories(react_codegen_SampleWithUppercaseName PUBLIC . react/renderer/components/SampleWithUppercaseName)
53+
target_include_directories(react_codegen_SampleWithUppercaseName PUBLIC . react/renderer/components react/renderer/components/SampleWithUppercaseName)
5454
5555
target_link_libraries(
5656
react_codegen_SampleWithUppercaseName
@@ -137,7 +137,7 @@ add_library(
137137
\${react_codegen_SRCS}
138138
)
139139
140-
target_include_directories(react_codegen_complex_objects PUBLIC . react/renderer/components/complex_objects)
140+
target_include_directories(react_codegen_complex_objects PUBLIC . react/renderer/components react/renderer/components/complex_objects)
141141
142142
target_link_libraries(
143143
react_codegen_complex_objects
@@ -217,7 +217,7 @@ add_library(
217217
\${react_codegen_SRCS}
218218
)
219219
220-
target_include_directories(react_codegen_cxx_only_native_modules PUBLIC . react/renderer/components/cxx_only_native_modules)
220+
target_include_directories(react_codegen_cxx_only_native_modules PUBLIC . react/renderer/components react/renderer/components/cxx_only_native_modules)
221221
222222
target_link_libraries(
223223
react_codegen_cxx_only_native_modules
@@ -304,7 +304,7 @@ add_library(
304304
\${react_codegen_SRCS}
305305
)
306306
307-
target_include_directories(react_codegen_empty_native_modules PUBLIC . react/renderer/components/empty_native_modules)
307+
target_include_directories(react_codegen_empty_native_modules PUBLIC . react/renderer/components react/renderer/components/empty_native_modules)
308308
309309
target_link_libraries(
310310
react_codegen_empty_native_modules
@@ -391,7 +391,7 @@ add_library(
391391
\${react_codegen_SRCS}
392392
)
393393
394-
target_include_directories(react_codegen_native_modules_with_type_aliases PUBLIC . react/renderer/components/native_modules_with_type_aliases)
394+
target_include_directories(react_codegen_native_modules_with_type_aliases PUBLIC . react/renderer/components react/renderer/components/native_modules_with_type_aliases)
395395
396396
target_link_libraries(
397397
react_codegen_native_modules_with_type_aliases
@@ -486,7 +486,7 @@ add_library(
486486
\${react_codegen_SRCS}
487487
)
488488
489-
target_include_directories(react_codegen_real_module_example PUBLIC . react/renderer/components/real_module_example)
489+
target_include_directories(react_codegen_real_module_example PUBLIC . react/renderer/components react/renderer/components/real_module_example)
490490
491491
target_link_libraries(
492492
react_codegen_real_module_example
@@ -573,7 +573,7 @@ add_library(
573573
\${react_codegen_SRCS}
574574
)
575575
576-
target_include_directories(react_codegen_simple_native_modules PUBLIC . react/renderer/components/simple_native_modules)
576+
target_include_directories(react_codegen_simple_native_modules PUBLIC . react/renderer/components react/renderer/components/simple_native_modules)
577577
578578
target_link_libraries(
579579
react_codegen_simple_native_modules
@@ -668,7 +668,7 @@ add_library(
668668
\${react_codegen_SRCS}
669669
)
670670
671-
target_include_directories(react_codegen_two_modules_different_files PUBLIC . react/renderer/components/two_modules_different_files)
671+
target_include_directories(react_codegen_two_modules_different_files PUBLIC . react/renderer/components react/renderer/components/two_modules_different_files)
672672
673673
target_link_libraries(
674674
react_codegen_two_modules_different_files

packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99

1010
#if __has_include(<ReactCodegen/AppSpecsJSI.h>) // CocoaPod headers on Apple
1111
#include <ReactCodegen/AppSpecsJSI.h>
12-
#elif __has_include("AppSpecsJSI.h") // Cmake headers on Android
13-
#include "AppSpecsJSI.h"
14-
#else // BUCK headers
12+
#else
1513
#include <AppSpecs/AppSpecsJSI.h>
1614
#endif
1715
#include <memory>

0 commit comments

Comments
 (0)