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
eee42d19
Verified
Commit
eee42d19
authored
3 years ago
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
Fix CMakeLists.txt (BUILD_SHARED_LIBS option)
parent
2e6e09f6
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!33
Release 0.1
,
!32
fix windows build
Pipeline
#15246
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
+4
-3
4 additions, 3 deletions
CMakeLists.txt
include/caosdb/transaction.h
+12
-12
12 additions, 12 deletions
include/caosdb/transaction.h
with
16 additions
and
15 deletions
CMakeLists.txt
+
4
−
3
View file @
eee42d19
...
@@ -39,7 +39,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
...
@@ -39,7 +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_LIB
RARY
"Build using shared libraries"
ON
)
option
(
BUILD_SHARED_LIB
S
"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
}
)
...
@@ -251,9 +251,8 @@ function(add_compiler_flag flag)
...
@@ -251,9 +251,8 @@ function(add_compiler_flag flag)
endfunction
()
endfunction
()
option
(
LINTING
"Enable linting with clang-tidy and iwyu when in non-Debug build-type"
OFF
)
option
(
LINTING
"Enable linting with clang-tidy and iwyu when in non-Debug build-type"
OFF
)
if
(
clang_tidy
AND
(
"
${
CMAKE_BUILD_TYPE
}
"
MATCHES
"Debug"
OR LINTING
)
)
if
(
"
${
CMAKE_BUILD_TYPE
}
"
MATCHES
"Debug"
OR LINTING
)
set
(
_LINTING ON
)
set
(
_LINTING ON
)
endif
()
endif
()
option
(
SKIP_LINTING
"Skip linting even when in Debug build-type"
OFF
)
option
(
SKIP_LINTING
"Skip linting even when in Debug build-type"
OFF
)
...
@@ -336,6 +335,8 @@ if (_LINTING)
...
@@ -336,6 +335,8 @@ if (_LINTING)
C_CLANG_TIDY
"
${
_CMAKE_C_CLANG_TIDY
}
;
${
_CMAKE_C_CLANG_TIDY_CHECKS
}
"
C_CLANG_TIDY
"
${
_CMAKE_C_CLANG_TIDY
}
;
${
_CMAKE_C_CLANG_TIDY_CHECKS
}
"
)
)
endif
()
endif
()
else
()
message
(
STATUS
"HEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEERE 5"
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
include/caosdb/transaction.h
+
12
−
12
View file @
eee42d19
...
@@ -91,11 +91,11 @@
...
@@ -91,11 +91,11 @@
return StatusCode::TRANSACTION_STATUS_ERROR; \
return StatusCode::TRANSACTION_STATUS_ERROR; \
} \
} \
switch (this->transaction_type) { \
switch (this->transaction_type) { \
case TransactionType::NONE:
\
case TransactionType::NONE: \
this->transaction_type = TransactionType::DELETE_ONLY;
\
this->transaction_type = TransactionType::DELETE_ONLY; \
case TransactionType::DELETE_ONLY:
\
case TransactionType::DELETE_ONLY: \
case TransactionType::MIXED_WRITE:
\
case TransactionType::MIXED_WRITE: \
case TransactionType::MIXED_READ_AND_WRITE:
\
case TransactionType::MIXED_READ_AND_WRITE: \
break; \
break; \
default: \
default: \
CAOSDB_LOG_ERROR_AND_RETURN_STATUS( \
CAOSDB_LOG_ERROR_AND_RETURN_STATUS( \
...
@@ -114,8 +114,8 @@
...
@@ -114,8 +114,8 @@
} \
} \
switch (this->transaction_type) { \
switch (this->transaction_type) { \
case TransactionType::NONE: \
case TransactionType::NONE: \
this->transaction_type = TransactionType::INSERT_ONLY;
\
this->transaction_type = TransactionType::INSERT_ONLY; \
case TransactionType::INSERT_ONLY:
\
case TransactionType::INSERT_ONLY: \
case TransactionType::MIXED_WRITE: \
case TransactionType::MIXED_WRITE: \
case TransactionType::MIXED_READ_AND_WRITE: \
case TransactionType::MIXED_READ_AND_WRITE: \
break; \
break; \
...
@@ -136,8 +136,8 @@
...
@@ -136,8 +136,8 @@
} \
} \
switch (this->transaction_type) { \
switch (this->transaction_type) { \
case TransactionType::NONE: \
case TransactionType::NONE: \
this->transaction_type = TransactionType::UPDATE_ONLY;
\
this->transaction_type = TransactionType::UPDATE_ONLY; \
case TransactionType::UPDATE_ONLY:
\
case TransactionType::UPDATE_ONLY: \
case TransactionType::MIXED_WRITE: \
case TransactionType::MIXED_WRITE: \
case TransactionType::MIXED_READ_AND_WRITE: \
case TransactionType::MIXED_READ_AND_WRITE: \
break; \
break; \
...
@@ -288,9 +288,9 @@ public:
...
@@ -288,9 +288,9 @@ public:
enum
TransactionType
{
enum
TransactionType
{
NONE
,
//!< Unspecified or not specified yet.
NONE
,
//!< Unspecified or not specified yet.
READ_ONLY
,
//!< Only retrievals (by id, by query)
READ_ONLY
,
//!< Only retrievals (by id, by query)
INSERT_ONLY
,
//!< Only insertions
INSERT_ONLY
,
//!< Only insertions
UPDATE_ONLY
,
//!< Only updates
UPDATE_ONLY
,
//!< Only updates
DELETE_ONLY
,
//!< Only deletions
DELETE_ONLY
,
//!< Only deletions
MIXED_WRITE
,
//!< Only insertions, deletions, updates
MIXED_WRITE
,
//!< Only insertions, deletions, updates
MIXED_READ_AND_WRITE
//!< all kind of transaction.
MIXED_READ_AND_WRITE
//!< all kind of transaction.
};
};
...
...
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