Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-cpplib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-cpplib
Commits
940ffaab
Verified
Commit
940ffaab
authored
3 years ago
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
Add option for static linkage
parent
aacdcc54
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!33
Release 0.1
,
!32
fix windows build
Pipeline
#15244
failed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+5
-4
5 additions, 4 deletions
CMakeLists.txt
include/caosdb/constants.h.in
+8
-8
8 additions, 8 deletions
include/caosdb/constants.h.in
with
13 additions
and
12 deletions
CMakeLists.txt
+
5
−
4
View file @
940ffaab
...
...
@@ -39,6 +39,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
set
(
CMAKE_CXX_EXTENSIONS OFF
)
set
(
CMAKE_CXX_STANDARD_REQUIRED 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
}
)
...
...
@@ -147,8 +148,8 @@ add_custom_command(
###############################################################################
if
(
"
${
CMAKE_BUILD_TYPE
}
"
MATCHES
"Debug"
)
add_library
(
caosdb_grpc
SHARED
${
GRPC_GENERATED
}
)
add_library
(
caosdb
SHARED
${
libcaosdb_INCL
}
${
libcaosdb_SRC
}
)
add_library
(
caosdb_grpc
${
GRPC_GENERATED
}
)
add_library
(
caosdb
${
libcaosdb_INCL
}
${
libcaosdb_SRC
}
)
target_link_libraries
(
caosdb caosdb_grpc
)
target_link_libraries
(
caosdb_grpc
${
CONAN_LIBS
}
)
set
(
LIBCAOSDB caosdb caosdb_grpc
)
...
...
@@ -164,7 +165,7 @@ if("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
)
else
()
add_library
(
caosdb
SHARED
${
libcaosdb_INCL
}
${
libcaosdb_SRC
}
${
GRPC_GENERATED
}
)
${
libcaosdb_INCL
}
${
libcaosdb_SRC
}
${
GRPC_GENERATED
}
)
set
(
LIBCAOSDB caosdb
)
endif
()
target_link_libraries
(
caosdb
...
...
@@ -179,7 +180,7 @@ target_include_directories(caosdb PUBLIC
$<INSTALL_INTERFACE:include>
)
add_library
(
ccaosdb
SHARED
src/ccaosdb.cpp
)
add_library
(
ccaosdb src/ccaosdb.cpp
)
target_link_libraries
(
ccaosdb
${
LIBCAOSDB
}
${
CONAN_LIBS
}
...
...
This diff is collapsed.
Click to expand it.
include/caosdb/constants.h.in
+
8
−
8
View file @
940ffaab
...
...
@@ -26,18 +26,18 @@
namespace caosdb {
#endif
// clang-format off
const int LIBCAOSDB_VERSION_MAJOR = @libcaosdb_VERSION_MAJOR@;
const int LIBCAOSDB_VERSION_MINOR = @libcaosdb_VERSION_MINOR@;
const int LIBCAOSDB_VERSION_PATCH = @libcaosdb_VERSION_PATCH@;
const int COMPATIBLE_SERVER_VERSION_MAJOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR@;
const int COMPATIBLE_SERVER_VERSION_MINOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR@;
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 int LIBCAOSDB_VERSION_MAJOR = @libcaosdb_VERSION_MAJOR@;
static
const int LIBCAOSDB_VERSION_MINOR = @libcaosdb_VERSION_MINOR@;
static
const int LIBCAOSDB_VERSION_PATCH = @libcaosdb_VERSION_PATCH@;
static
const int COMPATIBLE_SERVER_VERSION_MAJOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR@;
static
const int COMPATIBLE_SERVER_VERSION_MINOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR@;
static
const int COMPATIBLE_SERVER_VERSION_PATCH = @libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH@;
static
const char* COMPATIBLE_SERVER_VERSION_PRE_RELEASE = "@libcaosdb_COMPATIBLE_SERVER_VERSION_PRE_RELEASE@";
/**
* 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.json",
"caosdb-client.json",
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment