Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

caosdb-cppinttest
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

2fdfea98

Commit 2fdfea98 authored 9 months ago by Florian Spreckelsen

Downloads
- Plain Diff

Merge branch 'f-73-extern-adapt-to-conan-2-0' into 'dev'

Adapt for Conan 2

See merge request !35

parents 577dc4c9 ca7b280f

Branches

Tags

Loading

Checking pipeline status

Changes 8
Pipelines 171

Hide whitespace changes

Inline Side-by-side

Showing

.docker/Dockerfile 4 additions, 8 deletions

.docker/Dockerfile
.gitignore 0 additions, 1 deletion

.gitignore
.gitlab-ci.yml 2 additions, 6 deletions

.gitlab-ci.yml
CMakeLists.txt 10 additions, 14 deletions

CMakeLists.txt
Makefile 36 additions, 4 deletions

Makefile
README.md 12 additions, 4 deletions

README.md
conanfile.txt 9 additions, 3 deletions

conanfile.txt
test/CMakeLists.txt 11 additions, 9 deletions

test/CMakeLists.txt

with 84 additions and 49 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment