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
abf848db
Verified
Commit
abf848db
authored
3 years ago
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
WIP: conan
parent
e8edefd0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#9658
passed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest
#9659
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
conanfile.py
+3
-5
3 additions, 5 deletions
conanfile.py
test_package/example.cpp
+5
-2
5 additions, 2 deletions
test_package/example.cpp
with
8 additions
and
7 deletions
conanfile.py
+
3
−
5
View file @
abf848db
...
@@ -14,13 +14,12 @@ class LibcaosdbConan(ConanFile):
...
@@ -14,13 +14,12 @@ class LibcaosdbConan(ConanFile):
default_options
=
{
"
shared
"
:
False
,
"
fPIC
"
:
True
}
default_options
=
{
"
shared
"
:
False
,
"
fPIC
"
:
True
}
generators
=
"
cmake
"
generators
=
"
cmake
"
requires
=
[(
"
boost/1.76.0
"
),
(
"
gtest/1.11.0
"
),
(
"
grpc/1.38.0
"
)]
requires
=
[(
"
boost/1.76.0
"
),
(
"
gtest/1.11.0
"
),
(
"
grpc/1.38.0
"
)]
exports
=
"
*.cpp
"
,
"
*h
"
exports
=
"
*.cpp
"
,
"
*h
"
,
"
*.cmake
"
,
"
*CMakeLists.txt
"
,
"
*.in
"
,
"
*.proto
"
exports_sources
=
"
src
"
,
"
doc
"
,
"
include
"
,
"
test
"
,
"
cmake
"
,
"
proto
"
def
config_options
(
self
):
def
config_options
(
self
):
if
self
.
settings
.
os
==
"
Windows
"
:
if
self
.
settings
.
os
==
"
Windows
"
:
del
self
.
options
.
fPIC
del
self
.
options
.
fPIC
elif
self
.
settings
.
get_safe
(
"
compiler.libcxx
"
)
is
not
None
:
self
.
settings
.
compiler
.
libcxx
=
"
libstdc++11
"
def
source
(
self
):
def
source
(
self
):
self
.
run
(
"
git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git
"
)
self
.
run
(
"
git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git
"
)
...
@@ -31,7 +30,7 @@ class LibcaosdbConan(ConanFile):
...
@@ -31,7 +30,7 @@ class LibcaosdbConan(ConanFile):
def
build
(
self
):
def
build
(
self
):
cmake
=
CMake
(
self
)
cmake
=
CMake
(
self
)
cmake
.
configure
(
source_folder
=
"
src
"
)
cmake
.
configure
(
source_folder
=
""
)
cmake
.
build
()
cmake
.
build
()
# Explicit way:
# Explicit way:
...
@@ -41,7 +40,6 @@ class LibcaosdbConan(ConanFile):
...
@@ -41,7 +40,6 @@ class LibcaosdbConan(ConanFile):
def
package
(
self
):
def
package
(
self
):
self
.
copy
(
"
*.h
"
,
dst
=
"
include
"
,
src
=
"
include
"
)
self
.
copy
(
"
*.h
"
,
dst
=
"
include
"
,
src
=
"
include
"
)
self
.
copy
(
"
*hello.lib
"
,
dst
=
"
lib
"
,
keep_path
=
False
)
self
.
copy
(
"
*.dll
"
,
dst
=
"
bin
"
,
keep_path
=
False
)
self
.
copy
(
"
*.dll
"
,
dst
=
"
bin
"
,
keep_path
=
False
)
self
.
copy
(
"
*.so
"
,
dst
=
"
lib
"
,
keep_path
=
False
)
self
.
copy
(
"
*.so
"
,
dst
=
"
lib
"
,
keep_path
=
False
)
self
.
copy
(
"
*.dylib
"
,
dst
=
"
lib
"
,
keep_path
=
False
)
self
.
copy
(
"
*.dylib
"
,
dst
=
"
lib
"
,
keep_path
=
False
)
...
...
This diff is collapsed.
Click to expand it.
test_package/example.cpp
+
5
−
2
View file @
abf848db
#include
"hello.h"
#include
<iostream>
#include
"caosdb/connection.h"
int
main
()
{
int
main
()
{
hello
();
caosdb
::
connection
::
InsecureCaosDBConnectionConfig
config
(
"localhost"
,
8443
);
std
::
cout
<<
config
<<
"
\n
"
;
}
}
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