Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
ECSS Services
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository 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
AcubeSat-OBC
ECSS Services
Commits
4e7207b8
Commit
4e7207b8
authored
6 years ago
by
Grigoris Pavlakis
Committed by
kongr45gpen
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update CMakeLists.txt to prevent merge conflicts
parent
42ea9268
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+2
-1
2 additions, 1 deletion
CMakeLists.txt
with
2 additions
and
1 deletion
CMakeLists.txt
+
2
−
1
View file @
4e7207b8
...
@@ -26,7 +26,8 @@ add_library(common OBJECT
...
@@ -26,7 +26,8 @@ add_library(common OBJECT
src/Services/RequestVerificationService.cpp
src/Services/RequestVerificationService.cpp
src/Services/TestService.cpp
src/Services/TestService.cpp
src/Services/TimeManagementService.cpp
src/Services/TimeManagementService.cpp
src/Services/FunctionManagementService.cpp
)
src/Services/FunctionManagementService.cpp
)
# Specify the .cpp files for the executables
# Specify the .cpp files for the executables
add_executable
(
ecss_services
add_executable
(
ecss_services
...
...
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