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
db9a94b6
Verified
Commit
db9a94b6
authored
3 years ago
by
Timm Fitschen
Browse files
Options
Downloads
Plain Diff
Merge branch 'f-extended-c' into f-consolidation
parents
9664ee6a
33f388f6
No related branches found
No related tags found
1 merge request
!12
F consolidation
Pipeline
#12106
passed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest
#12112
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
README_SETUP.md
+6
-3
6 additions, 3 deletions
README_SETUP.md
include/caosdb/entity.h
+1
-2
1 addition, 2 deletions
include/caosdb/entity.h
with
7 additions
and
5 deletions
README_SETUP.md
+
6
−
3
View file @
db9a94b6
...
...
@@ -48,10 +48,9 @@ as compiler. We use [cmake](https://cmake.org/download/) as build tool.
and build the project. (You can open Tools/Command Line/Developer Command
Prompt and execute
`msbuild libcaosdb.sln /property:Configuration=Release`
)
### Creating a
l
ocal Conan
p
ackage ##
### Creating a
L
ocal Conan
P
ackage ##
Building and installing libcaosdb with Conan is just a single command:
`conan create . -s "compiler.libcxx=libstdc++11"`
Building and installing libcaosdb with Conan is just a single command:
`make conan-install`
For MacOS, you probably should adjust the option as mentioned above.
...
...
@@ -65,6 +64,10 @@ the `--build=missing` option: `conan install .. [ other options
] --build=missing`
. This should download and compile the sources of the
dependencies.
#### cmake fails when using the Debug flag
Depending on the clang version it might be necessary to use additionally the following flag:
`-DCMAKE_CXX_FLAGS="-Wno-unused-parameter"`
## Unit Tests
### Build
...
...
This diff is collapsed.
Click to expand it.
include/caosdb/entity.h
+
1
−
2
View file @
db9a94b6
...
...
@@ -66,9 +66,8 @@ using caosdb::StatusCode;
using
caosdb
::
entity
::
v1alpha1
::
EntityResponse
;
using
caosdb
::
entity
::
v1alpha1
::
FileTransmissionId
;
using
google
::
protobuf
::
RepeatedPtrField
;
using
ProtoMessage
=
caosdb
::
entity
::
v1alpha1
::
Message
;
const
static
std
::
string
logger_name
=
"caosdb::entity"
;
static
const
std
::
string
logger_name
=
"caosdb::entity"
;
/**
* The property importance.
...
...
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