Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

ECSS Services
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

e60b57d9

Commit e60b57d9 authored 1 year ago by Orestis Ousoultzoglou

Downloads
- Plain Diff

Merge branch 'conan-package' into 'master'

Conan package

Closes #196 and #195

See merge request acubesat/obc/ecss-services!148

parents 57bf9343 baa6f603

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 7 additions, 1 deletion

.gitignore
.gitlab-ci.yml 31 additions, 7 deletions

.gitlab-ci.yml
.gitmodules 0 additions, 3 deletions

.gitmodules
.idea/ecss-services.iml 7 additions, 1 deletion

.idea/ecss-services.iml
.idea/vcs.xml 0 additions, 1 deletion

.idea/vcs.xml
CMakeLists.txt 15 additions, 22 deletions

CMakeLists.txt
README.md 17 additions, 2 deletions

README.md
conan-profile 1 addition, 1 deletion

conan-profile
conanfile.py 62 additions, 0 deletions

conanfile.py
conanfile.txt 0 additions, 7 deletions

conanfile.txt
lib/logger 0 additions, 1 deletion

lib/logger

with 140 additions and 46 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