Skip to content
Snippets Groups Projects
Verified Commit 940ffaab authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Add option for static linkage

parent aacdcc54
Branches
Tags
2 merge requests!33Release 0.1,!32fix windows build
Pipeline #15244 failed
...@@ -39,6 +39,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON) ...@@ -39,6 +39,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
option(BUILD_SHARED_LIBRARY "Build using shared libraries" ON)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
...@@ -147,8 +148,8 @@ add_custom_command( ...@@ -147,8 +148,8 @@ add_custom_command(
############################################################################### ###############################################################################
if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
add_library(caosdb_grpc SHARED ${GRPC_GENERATED}) add_library(caosdb_grpc ${GRPC_GENERATED})
add_library(caosdb SHARED ${libcaosdb_INCL} ${libcaosdb_SRC}) add_library(caosdb ${libcaosdb_INCL} ${libcaosdb_SRC})
target_link_libraries(caosdb caosdb_grpc) target_link_libraries(caosdb caosdb_grpc)
target_link_libraries(caosdb_grpc ${CONAN_LIBS}) target_link_libraries(caosdb_grpc ${CONAN_LIBS})
set(LIBCAOSDB caosdb caosdb_grpc) set(LIBCAOSDB caosdb caosdb_grpc)
...@@ -164,7 +165,7 @@ if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") ...@@ -164,7 +165,7 @@ if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
) )
else() else()
add_library(caosdb add_library(caosdb
SHARED ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED}) ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
set(LIBCAOSDB caosdb) set(LIBCAOSDB caosdb)
endif() endif()
target_link_libraries(caosdb target_link_libraries(caosdb
...@@ -179,7 +180,7 @@ target_include_directories(caosdb PUBLIC ...@@ -179,7 +180,7 @@ target_include_directories(caosdb PUBLIC
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
add_library(ccaosdb SHARED src/ccaosdb.cpp) add_library(ccaosdb src/ccaosdb.cpp)
target_link_libraries(ccaosdb target_link_libraries(ccaosdb
${LIBCAOSDB} ${LIBCAOSDB}
${CONAN_LIBS} ${CONAN_LIBS}
......
...@@ -26,18 +26,18 @@ ...@@ -26,18 +26,18 @@
namespace caosdb { namespace caosdb {
#endif #endif
// clang-format off // clang-format off
const int LIBCAOSDB_VERSION_MAJOR = @libcaosdb_VERSION_MAJOR@; static const int LIBCAOSDB_VERSION_MAJOR = @libcaosdb_VERSION_MAJOR@;
const int LIBCAOSDB_VERSION_MINOR = @libcaosdb_VERSION_MINOR@; static const int LIBCAOSDB_VERSION_MINOR = @libcaosdb_VERSION_MINOR@;
const int LIBCAOSDB_VERSION_PATCH = @libcaosdb_VERSION_PATCH@; static const int LIBCAOSDB_VERSION_PATCH = @libcaosdb_VERSION_PATCH@;
const int COMPATIBLE_SERVER_VERSION_MAJOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR@; static const int COMPATIBLE_SERVER_VERSION_MAJOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR@;
const int COMPATIBLE_SERVER_VERSION_MINOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR@; static const int COMPATIBLE_SERVER_VERSION_MINOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR@;
const int COMPATIBLE_SERVER_VERSION_PATCH = @libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH@; static const int COMPATIBLE_SERVER_VERSION_PATCH = @libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH@;
const char* COMPATIBLE_SERVER_VERSION_PRE_RELEASE = "@libcaosdb_COMPATIBLE_SERVER_VERSION_PRE_RELEASE@"; static const char* COMPATIBLE_SERVER_VERSION_PRE_RELEASE = "@libcaosdb_COMPATIBLE_SERVER_VERSION_PRE_RELEASE@";
/** /**
* Precedence of configuration files from highest to lowest. * Precedence of configuration files from highest to lowest.
*/ */
const char* LIBCAOSDB_CONFIGURATION_FILES_PRECEDENCE[] = { static const char* LIBCAOSDB_CONFIGURATION_FILES_PRECEDENCE[] = {
"$CAOSDB_CLIENT_CONFIGURATION", "$CAOSDB_CLIENT_CONFIGURATION",
"caosdb_client.json", "caosdb_client.json",
"caosdb-client.json", "caosdb-client.json",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment