From fbb73dd4a1d2130e12b68a811e911e058fdc69b2 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 12 Jul 2021 13:59:18 +0200
Subject: [PATCH] WIP: basic c interface
---
CMakeLists.txt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e00824a..ffdd2f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,8 +127,8 @@ add_custom_command(
###############################################################################
if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
- add_library(caosdb_grpc STATIC ${GRPC_GENERATED})
- add_library(caosdb STATIC ${libcaosdb_INCL} ${libcaosdb_SRC})
+ add_library(caosdb_grpc SHARED ${GRPC_GENERATED})
+ add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC})
target_link_libraries(caosdb caosdb_grpc)
set(LIBCAOSDB caosdb caosdb_grpc)
@@ -141,7 +141,7 @@ if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
)
else()
add_library(caosdb
- STATIC ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
+ SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
set(LIBCAOSDB caosdb)
endif()
target_link_libraries(caosdb
@@ -154,7 +154,7 @@ target_include_directories(caosdb PUBLIC
${CONAN_INCLUDE_DIRS}
)
-add_library(ccaosdb STATIC src/ccaosdb.cpp)
+add_library(ccaosdb SHARED src/ccaosdb.cpp)
target_link_libraries(ccaosdb
${LIBCAOSDB}
${CONAN_LIBS}
@@ -269,7 +269,7 @@ set(libcaosdb_LIB_DEST "lib")
set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/.local/")
install(
# targets to install
- TARGETS ${LIBCAOSDB}
+ TARGETS ${LIBCAOSDB} ccaosdb
# name of the CMake "export group" containing the targets we want to install
EXPORT caosdbTargets
# Dynamic, static library and include destination locations after running
@@ -294,9 +294,9 @@ install(
DESTINATION ${libcaosdb_CMAKE_DEST}
)
-install(FILES ${libcaosdb_INCL} DESTINATION ${libcaosdb_INCLUDE_DEST})
-install(FILES ${GRPC_GENERATED_HEADERS}
- DESTINATION ${libcaosdb_INCLUDE_DEST}/${hw_hdrs_path})
+install(FILES ${libcaosdb_INCL} ${PROJECT_SOURCE_DIR}/include/ccaosdb.h DESTINATION ${libcaosdb_INCLUDE_DEST})
+install(FILES ${GRPC_GENERATED_HEADERS} DESTINATION ${libcaosdb_INCLUDE_DEST})
+
install(FILES ${PROJECT_SOURCE_DIR}/caosdbConfig.cmake
DESTINATION ${libcaosdb_CMAKE_DEST})
--
GitLab