Page MenuHomePhabricator
Files F3269915

D4989.id16119.diff
No OneTemporary
Actions

D4989.id16119.diff
View Options

diff --git a/native/cpp/CommonCpp/CMakeLists.txt b/native/cpp/CommonCpp/CMakeLists.txt
--- a/native/cpp/CommonCpp/CMakeLists.txt
+++ b/native/cpp/CommonCpp/CMakeLists.txt
@@ -19,3 +19,20 @@
comm-tools
comm-databasemanagers
)
+
+target_link_libraries(comm-modules-internal
+ comm-tools
+ comm-client
+)
+
+target_link_libraries(comm-modules-native
+ comm-client
+ comm-cryptotools
+ comm-databasemanagers
+ comm-tools
+)
+
+target_link_libraries(comm-modules-persistentstorage
+ comm-databasemanagers
+ comm-client
+)
diff --git a/native/cpp/CommonCpp/DatabaseManagers/CMakeLists.txt b/native/cpp/CommonCpp/DatabaseManagers/CMakeLists.txt
--- a/native/cpp/CommonCpp/DatabaseManagers/CMakeLists.txt
+++ b/native/cpp/CommonCpp/DatabaseManagers/CMakeLists.txt
@@ -29,6 +29,7 @@
target_include_directories(comm-databasemanagers
PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../Tools>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
diff --git a/native/cpp/CommonCpp/NativeModules/CMakeLists.txt b/native/cpp/CommonCpp/NativeModules/CMakeLists.txt
--- a/native/cpp/CommonCpp/NativeModules/CMakeLists.txt
+++ b/native/cpp/CommonCpp/NativeModules/CMakeLists.txt
@@ -3,11 +3,6 @@
include(GNUInstallDirs)
-# TODO: Remove once we can link between CommonCpp projects
-find_package(gRPC REQUIRED)
-find_package(Olm REQUIRED)
-find_package(Folly REQUIRED)
-
set(INTERNAL_HDRS
"InternalModules/GlobalNetworkSingleton.h"
"InternalModules/GlobalNetworkSingletonJNIHelper.h"
@@ -28,16 +23,9 @@
target_include_directories(comm-modules-internal
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../Tools>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../DatabaseManagers>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
-target_link_libraries(comm-modules-internal
- Folly::folly
- gRPC::grpc++
-)
-
set(NATIVE_HDRS
"CommCoreModule.h"
"MessageStoreOperations.h"
@@ -59,9 +47,6 @@
target_include_directories(comm-modules-native
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../Tools>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../grpc>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../DatabaseManagers>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
# HACK
PRIVATE
@@ -70,12 +55,6 @@
"../../../../node_modules/react-native/ReactCommon/callinvoker"
)
-target_link_libraries(comm-modules-native
- Olm::Olm
- Folly::folly
- gRPC::grpc++
-)
-
set(_message_path ./PersistentStorageUtilities/MessageOperationsUtilities)
set(MESSAGE_HDRS
${_message_path}/MessageOperationsUtilities.h
@@ -116,11 +95,6 @@
"../../../node_modules/react-native/ReactCommon/jsi"
)
-target_link_libraries(comm-modules-persistentstorage
- Olm::Olm
- Folly::folly
-)
-
set(_components internal native persistentstorage)
foreach(component ${_components})

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 4:13 AM (21 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2513086
Default Alt Text
D4989.id16119.diff (2 KB)

Event Timeline