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
757cc6c0
Commit
757cc6c0
authored
3 years ago
by
Alexander Kreft
Browse files
Options
Downloads
Patches
Plain Diff
Fix for compiling with Visual Studio
parent
43fdade1
No related branches found
No related tags found
1 merge request
!3
Better Error Handling and Logging
Pipeline
#10833
failed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+11
-2
11 additions, 2 deletions
CMakeLists.txt
README_SETUP.md
+12
-0
12 additions, 0 deletions
README_SETUP.md
conanfile.py
+1
-1
1 addition, 1 deletion
conanfile.py
with
24 additions
and
3 deletions
CMakeLists.txt
+
11
−
2
View file @
757cc6c0
...
@@ -41,6 +41,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
...
@@ -41,6 +41,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set
(
CMAKE_MODULE_PATH
"
${
PROJECT_SOURCE_DIR
}
/cmake"
${
CMAKE_MODULE_PATH
}
)
set
(
CMAKE_MODULE_PATH
"
${
PROJECT_SOURCE_DIR
}
/cmake"
${
CMAKE_MODULE_PATH
}
)
IF
(
WIN32
)
set
(
CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON
)
ENDIF
()
###########################################
###########################################
### DEPENDENCY MANAGEMENT with CONAN
### DEPENDENCY MANAGEMENT with CONAN
###########################################
###########################################
...
@@ -79,8 +83,13 @@ set(PROTO_FILES
...
@@ -79,8 +83,13 @@ set(PROTO_FILES
set
(
PROTO_PATH
${
PROJECT_SOURCE_DIR
}
/proto/proto
)
set
(
PROTO_PATH
${
PROJECT_SOURCE_DIR
}
/proto/proto
)
# compiler binaries
# compiler binaries
set
(
_PROTOBUF_PROTOC
"
${
CMAKE_BINARY_DIR
}
/build_tools/protoc"
)
IF
(
WIN32
)
set
(
_GRPC_CPP_PLUGIN_EXECUTABLE
"
${
CMAKE_BINARY_DIR
}
/build_tools/grpc_cpp_plugin"
)
set
(
_PROTOBUF_PROTOC
"
${
CMAKE_BINARY_DIR
}
/build_tools/protoc.exe"
)
set
(
_GRPC_CPP_PLUGIN_EXECUTABLE
"
${
CMAKE_BINARY_DIR
}
/build_tools/grpc_cpp_plugin.exe"
)
ELSE
()
set
(
_PROTOBUF_PROTOC
"
${
CMAKE_BINARY_DIR
}
/build_tools/protoc"
)
set
(
_GRPC_CPP_PLUGIN_EXECUTABLE
"
${
CMAKE_BINARY_DIR
}
/build_tools/grpc_cpp_plugin"
)
ENDIF
()
# Generated sources
# Generated sources
list
(
LENGTH PROTO_FILES len_proto_files
)
list
(
LENGTH PROTO_FILES len_proto_files
)
...
...
This diff is collapsed.
Click to expand it.
README_SETUP.md
+
12
−
0
View file @
757cc6c0
...
@@ -29,6 +29,18 @@ have to add `build/lib/` (or, alternatively after installation,
...
@@ -29,6 +29,18 @@ have to add `build/lib/` (or, alternatively after installation,
`CMAKE_INSTALL_PREFIX/lib`
) to your
`DYLD_LIBRARY_PATH`
environmental
`CMAKE_INSTALL_PREFIX/lib`
) to your
`DYLD_LIBRARY_PATH`
environmental
variable.
variable.
### How to build on Windows
We use
[
Visual Studio 2019
](
https://visualstudio.microsoft.com/de/vs/features/cplusplus/
)
as compiler.
We use
[
cmake
](
https://cmake.org/download/
)
as build tool.
1.
`mkdir build`
2.
`cd build`
3.
`conan install .. -g visual_studio -s arch=x86_64 -s build_type=Release -s compiler.toolset=v142 -s compiler.version=16 -s compiler.runtime=MD --build=missing --update`
4.
`cmake -B . ..`
5.
open
` libcaosdb.sln`
with Visual Studio, change the buildtype to
`Release`
and build the project.
(You can open Tools/Command Line/Developer Command Prompt and execute
`msbuild libcaosdb.sln /property:Configuration=Release`
)
## Unit Tests
## Unit Tests
### Build
### Build
...
...
This diff is collapsed.
Click to expand it.
conanfile.py
+
1
−
1
View file @
757cc6c0
...
@@ -28,7 +28,7 @@ class CaosdbConan(ConanFile):
...
@@ -28,7 +28,7 @@ class CaosdbConan(ConanFile):
def
imports
(
self
):
def
imports
(
self
):
self
.
copy
(
"
protoc*
"
,
"
build_tools
"
,
"
bin
"
)
self
.
copy
(
"
protoc*
"
,
"
build_tools
"
,
"
bin
"
)
self
.
copy
(
"
grpc_cpp_plugin
"
,
"
build_tools
"
,
"
bin
"
)
self
.
copy
(
"
grpc_cpp_plugin
*
"
,
"
build_tools
"
,
"
bin
"
)
def
build
(
self
):
def
build
(
self
):
cmake
=
CMake
(
self
)
cmake
=
CMake
(
self
)
...
...
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