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

cd900989

Commit cd900989 authored 1 year ago by Orestis Ousoultzoglou

Downloads
- Plain Diff

Merge branch 'conan-migration' into 'master'

Change conan configs and readme

Closes #177

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

parents 0d520766 92ade4a0

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 0 deletions

.gitignore
.gitlab-ci.yml 55 additions, 38 deletions

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

.gitmodules
.idea/vcs.xml 0 additions, 2 deletions

.idea/vcs.xml
CMakeLists.txt 13 additions, 11 deletions

CMakeLists.txt
README.md 29 additions, 2 deletions

README.md
conan-profile 8 additions, 0 deletions

conan-profile
conanfile.txt 7 additions, 0 deletions

conanfile.txt
inc/Message.hpp 1 addition, 1 deletion

inc/Message.hpp
lib/Catch2 0 additions, 1 deletion

lib/Catch2
lib/etl 0 additions, 1 deletion

lib/etl
src/Platform/x86/ErrorHandler.cpp 2 additions, 2 deletions

src/Platform/x86/ErrorHandler.cpp

with 118 additions and 64 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