From be5fe7b175f23e2bbe78099f76129e4dab9d6adf Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Wed, 21 Aug 2024 22:03:59 +0200
Subject: [PATCH] WIP: Remove separation of libs for grpc generated code
This is experimental.
---
CMakeLists.txt | 36 +++++++-----------------------------
1 file changed, 7 insertions(+), 29 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1375475..6567d8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,35 +163,13 @@ message(DEBUG "gRPC_INCLUDE_DIRS: ${gRPC_INCLUDE_DIRS}")
# libcaosdb
# ---------
-# In Debug, build separate libraries for grpc-generated code and caosdb
-if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-
- add_library(caosdb_grpc SHARED ${GRPC_GENERATED})
- target_link_libraries(caosdb_grpc
- gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
- )
- target_include_directories(caosdb_grpc PUBLIC
- $<BUILD_INTERFACE:${PROJECT_INCLUDE_DIR}>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
- $<INSTALL_INTERFACE:include>
- )
-
- add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC})
-
- target_link_libraries(caosdb
- caosdb_grpc gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
- )
-
- set(LIBCAOSDB caosdb caosdb_grpc)
-else()
- add_library(caosdb
- SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
- target_link_libraries(caosdb
- gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
- )
- set(LIBCAOSDB caosdb)
-endif()
+add_library(caosdb
+ SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
+target_link_libraries(caosdb
+ gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
+)
+set(LIBCAOSDB caosdb)
target_include_directories(caosdb PUBLIC
$<BUILD_INTERFACE:${libcaosdb_SOURCE_DIR}/include>
@@ -248,7 +226,7 @@ target_include_directories(cxxcaosdbcli SYSTEM PUBLIC
)
target_link_libraries(cxxcaosdbcli
${LIBCAOSDB}
- gRPC::grpc protobuf::libprotobuf ${Boost_LIBRARIES}
+ gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
)
--
GitLab