From ee2ac125b48849d402d52713a1fd20e5c6e2b851 Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@fb.com>
Date: Tue, 15 Mar 2022 08:14:07 -0700
Subject: [PATCH] Re-apply main changes to CMake files

Summary:
This Diff re-applies some of the changes that landed on main
to the CMake files we currently landed so far.

Changelog:
[Internal] [Changed] - Re-apply main changes to CMake files

Reviewed By: ShikaSD

Differential Revision: D34859685

fbshipit-source-id: 772a3aed05f56b6fbb2942bf9d1a5bd4581b48d5
---
 ReactCommon/react/bridging/CMakeLists.txt       | 17 +++++++++++++++++
 .../react/nativemodule/core/CMakeLists.txt      |  1 +
 ReactCommon/react/utils/CMakeLists.txt          |  3 +--
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 ReactCommon/react/bridging/CMakeLists.txt

diff --git a/ReactCommon/react/bridging/CMakeLists.txt b/ReactCommon/react/bridging/CMakeLists.txt
new file mode 100644
index 00000000000000..88d3aba2fae641
--- /dev/null
+++ b/ReactCommon/react/bridging/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"ReactNative\")
+
+file(GLOB react_bridging_SRC CONFIGURE_DEPENDS *.cpp)
+
+add_library(react_bridging STATIC ${react_bridging_SRC})
+
+target_include_directories(react_bridging PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_bridging jsi)
diff --git a/ReactCommon/react/nativemodule/core/CMakeLists.txt b/ReactCommon/react/nativemodule/core/CMakeLists.txt
index 1239bb17712509..844e3493a2287c 100644
--- a/ReactCommon/react/nativemodule/core/CMakeLists.txt
+++ b/ReactCommon/react/nativemodule/core/CMakeLists.txt
@@ -26,6 +26,7 @@ target_link_libraries(react_nativemodule_core
         fbjni
         folly_json
         jsi
+        react_bridging
         react_debug
         reactperflogger
         reactnativejni)
diff --git a/ReactCommon/react/utils/CMakeLists.txt b/ReactCommon/react/utils/CMakeLists.txt
index 8462de422a0ea4..335ebf9c365e76 100644
--- a/ReactCommon/react/utils/CMakeLists.txt
+++ b/ReactCommon/react/utils/CMakeLists.txt
@@ -21,5 +21,4 @@ target_include_directories(react_utils PUBLIC ${REACT_COMMON_DIR})
 target_link_libraries(react_utils
         glog
         glog_init
-        react_debug
-        react_render_mapbuffer)
+        react_debug)