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
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lennard Hofmann
RobotAPI
Commits
17e936cd
Commit
17e936cd
authored
3 years ago
by
Fabian Reister
Browse files
Options
Downloads
Patches
Plain Diff
armem_robot_mapping is now armem_vision
parent
33e59cb0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/libraries/CMakeLists.txt
+1
-1
1 addition, 1 deletion
source/RobotAPI/libraries/CMakeLists.txt
source/RobotAPI/libraries/armem_vision/CMakeLists.txt
+40
-0
40 additions, 0 deletions
source/RobotAPI/libraries/armem_vision/CMakeLists.txt
with
41 additions
and
1 deletion
source/RobotAPI/libraries/CMakeLists.txt
+
1
−
1
View file @
17e936cd
...
...
@@ -22,7 +22,7 @@ add_subdirectory(armem_gui)
add_subdirectory
(
armem_objects
)
add_subdirectory
(
armem_robot
)
add_subdirectory
(
armem_robot_state
)
add_subdirectory
(
armem_
robot_mapping
)
add_subdirectory
(
armem_
vision
)
add_subdirectory
(
armem_skills
)
add_subdirectory
(
aron
)
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/armem_
robot_mapping
/CMakeLists.txt
→
source/RobotAPI/libraries/armem_
vision
/CMakeLists.txt
+
40
−
0
View file @
17e936cd
set
(
LIB_NAME armem_
robot_mapping
)
set
(
LIB_NAME armem_
vision
)
armarx_component_set_name
(
"
${
LIB_NAME
}
"
)
armarx_set_target
(
"Library:
${
LIB_NAME
}
"
)
...
...
@@ -8,18 +8,23 @@ armarx_add_library(
# ArmarX
ArmarXCore
# This package
RobotAPICore
RobotAPI
::
Core
RobotAPI::armem
aroncommon
# System / External
Eigen3::Eigen
HEADERS
./aron_conversions.h
./MappingDataWriter.h
./MappingDataReader.h
./client/laser_scans/Reader.h
./client/laser_scans/Writer.h
# ./client/occupancy_grid/Reader.h
./client/occupancy_grid/Writer.h
SOURCES
./aron_conversions.cpp
./MappingDataWriter.cpp
./MappingDataReader.cpp
./client/laser_scans/Reader.cpp
./client/laser_scans/Writer.cpp
# ./client/occupancy_grid/Reader.cpp
./client/occupancy_grid/Writer.cpp
)
...
...
@@ -28,7 +33,8 @@ armarx_enable_aron_file_generation_for_target(
"
${
LIB_NAME
}
"
ARON_FILES
aron/LaserScan.xml
aron/OccupancyGrid.xml
)
add_library
(
RobotAPI::armem_
robot_mapping ALIAS armem_robot_mapping
)
add_library
(
RobotAPI::armem_
vision ALIAS armem_vision
)
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