Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
587ce36a
Commit
587ce36a
authored
1 year ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Refactor includes, cmake
parent
1a48743e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!402
Add Names to Locations
This commit is part of merge request
!402
. Comments created here will be created in the context of that merge request.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/libraries/aron/common/CMakeLists.txt
+10
-11
10 additions, 11 deletions
source/RobotAPI/libraries/aron/common/CMakeLists.txt
source/RobotAPI/libraries/aron/common/aron_conversions.h
+8
-3
8 additions, 3 deletions
source/RobotAPI/libraries/aron/common/aron_conversions.h
with
18 additions
and
14 deletions
source/RobotAPI/libraries/aron/common/CMakeLists.txt
+
10
−
11
Edit
View file @
587ce36a
...
...
@@ -18,15 +18,15 @@ armarx_add_library(
forward_declarations.h
json_conversions.h
aron_conversions/armarx.h
aron_conversions/core.h
aron_conversions/stl.h
aron_conversions/packagepath.h
aron_conversions/eigen.h
aron_conversions/framed.h
aron_conversions/names.h
aron_conversions/time.h
aron_conversions/armarx.h
aron_conversions/packagepath.h
aron_conversions/simox.h
aron_conversions/eigen.h
aron_conversions/stl.h
aron_conversions/time.h
json_conversions/armarx.h
json_conversions/framed.h
...
...
@@ -38,16 +38,15 @@ armarx_add_library(
util/object_finders.h
SOURCES
aron_conversions/armarx.cpp
aron_conversions/core.cpp
aron_conversions/stl.cpp
aron_conversions/packagepath.cpp
aron_conversions/eigen.cpp
aron_conversions/framed.cpp
aron_conversions/names.cpp
aron_conversions/time.cpp
aron_conversions/armarx.cpp
aron_conversions/packagepath.cpp
aron_conversions/simox.cpp
aron_conversions/eigen.cpp
aron_conversions/stl.cpp
aron_conversions/time.cpp
json_conversions/armarx.cpp
json_conversions/framed.cpp
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/aron/common/aron_conversions.h
+
8
−
3
Edit
View file @
587ce36a
#pragma once
#include
<RobotAPI/libraries/aron/common/aron_conversions/armarx.h>
#include
<RobotAPI/libraries/aron/common/aron_conversions/eigen.h>
#include
<RobotAPI/libraries/aron/common/aron_conversions/framed.h>
#include
<RobotAPI/libraries/aron/common/aron_conversions/names.h>
#include
<RobotAPI/libraries/aron/common/aron_conversions/packagepath.h>
#include
<RobotAPI/libraries/aron/common/aron_conversions/simox.h>
#include
<RobotAPI/libraries/aron/common/aron_conversions/stl.h>
#include
<RobotAPI/libraries/aron/common/aron_conversions/time.h>
#include
<RobotAPI/libraries/aron/core/aron_conversions.h>
#include
"aron_conversions/armarx.h"
#include
"aron_conversions/simox.h"
#include
"aron_conversions/eigen.h"
This diff is collapsed.
Click to expand it.
Tilman Daab
@daab
mentioned in merge request
!376
·
1 year ago
mentioned in merge request
!376
mentioned in merge request !376
Toggle commit list
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