Page MenuHomePhabricator
Files F3341495

D4988.diff
No OneTemporary
Actions

D4988.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
@@ -11,6 +11,10 @@
add_subdirectory(NativeModules)
add_subdirectory(Tools)
+target_link_libraries(comm-client
+ comm-modules-native
+)
+
target_link_libraries(comm-cryptotools
comm-tools
comm-databasemanagers
diff --git a/native/cpp/CommonCpp/grpc/CMakeLists.txt b/native/cpp/CommonCpp/grpc/CMakeLists.txt
--- a/native/cpp/CommonCpp/grpc/CMakeLists.txt
+++ b/native/cpp/CommonCpp/grpc/CMakeLists.txt
@@ -4,9 +4,6 @@
include(GNUInstallDirs)
find_package(protobuf REQUIRED)
find_package(gRPC REQUIRED)
-# TODO: remove once native modules can be
-# imported in CommonCpp/CMakeLists.txt
-find_package(Folly REQUIRED)
set(CMAKE_CXX_STANDARD 14)
# Allow for tools on PATH to be found
@@ -106,9 +103,6 @@
gRPC::grpc++
protobuf::libprotobuf
comm-tunnelbroker-grpc
- # TODO: remove once native modules can be
- # imported in CommonCpp/CMakeLists.txt
- Folly::folly
)
target_include_directories(comm-client

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 22, 11:07 PM (18 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2566357
Default Alt Text
D4988.diff (1 KB)

Event Timeline