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
4e282ebf
Commit
4e282ebf
authored
2 years ago
by
Fabian Reister
Browse files
Options
Downloads
Patches
Plain Diff
SickLaserUnit: using cmake target
parent
f2e36ee0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!280
SickLaserUnit: using cmake target instead of custom mechanism
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
etc/cmake/Findsick_scan_base.cmake
+0
-61
0 additions, 61 deletions
etc/cmake/Findsick_scan_base.cmake
source/RobotAPI/drivers/SickLaserUnit/CMakeLists.txt
+1
-2
1 addition, 2 deletions
source/RobotAPI/drivers/SickLaserUnit/CMakeLists.txt
with
1 addition
and
63 deletions
etc/cmake/Findsick_scan_base.cmake
deleted
100644 → 0
+
0
−
61
View file @
f2e36ee0
# - Try to find sick_scan_base
# This module defines the following variables:
# sick_scan_base_FOUND : 1 if sick_scan_base was found, 0 otherwise
# sick_scan_base_INCLUDE_DIRS: directory where the headers can be found
include
(
FindPackageHandleStandardArgs
)
if
(
DEFINED ENV{sick_scan_base_DIR}
)
if
(
NOT DEFINED sick_scan_base_DIR
)
set
(
sick_scan_base_DIR $ENV{sick_scan_base_DIR}
)
endif
()
endif
()
#if(NOT "$ENV{sick_scan_base_DIR}" EQUAL "")
# set(sick_scan_base_DIR $ENV{sick_scan_base_DIR} CACHE PATH "Path to sick_scan_base" FORCE)
#endif()
set
(
HEADER_SEARCH_PATHS
${
sick_scan_base_DIR
}
/include/
${
sick_scan_base_DIR
}
/include/sick_scan/
${
sick_scan_base_DIR
}
/include/tinyxml/
${
sick_scan_base_DIR
}
/roswrap/src/include/
${
sick_scan_base_DIR
}
/roswrap/src/rossimu/kinetic/include/
${
sick_scan_base_DIR
}
/roswrap/src/cfgsimu/
ENV CPATH
/usr/include/
#/opt/ros/melodic/include/
#/opt/ros/melodic/include/sick_scan/
)
#find_path(sick_scan_base_INCLUDE_DIR_7 NAMES sick_scan_common.h PATHS ${HEADER_SEARCH_PATHS} NO_DEFAULT_PATH)
#if(sick_scan_base_INCLUDE_DIR_7)
# set(sick_scan_base_INCLUDE_DIRS ${sick_scan_base_INCLUDE_DIR_7})
#endif()
#find_library(sick_scan_base_LIBRARIES NAMES libsick_scan_lib.so PATHS /opt/ros/melodic/lib/ NO_DEFAULT_PATH)
find_library
(
sick_scan_base_LIBRARIES NAMES libsick_scan_generic.so PATHS
${
sick_scan_base_DIR
}
/build NO_DEFAULT_PATH
)
message
(
STATUS
"sick_scan_base_LIBRARIES:
${
sick_scan_base_LIBRARIES
}
"
)
find_path
(
sick_scan_base_INCLUDE_DIR_0 NAMES sick_scan/sick_scan_common_tcp.h PATHS
${
HEADER_SEARCH_PATHS
}
NO_DEFAULT_PATH
)
find_path
(
sick_scan_base_INCLUDE_DIR_1 NAMES sick_generic_laser.h PATHS
${
HEADER_SEARCH_PATHS
}
NO_DEFAULT_PATH
)
find_path
(
sick_scan_base_INCLUDE_DIR_2 NAMES tinystr.h PATHS
${
HEADER_SEARCH_PATHS
}
NO_DEFAULT_PATH
)
find_path
(
sick_scan_base_INCLUDE_DIR_3 NAMES sick_scan/SickScanConfig.h PATHS
${
HEADER_SEARCH_PATHS
}
NO_DEFAULT_PATH
)
find_path
(
sick_scan_base_INCLUDE_DIR_4 NAMES dynamic_reconfigure/config_tools.h PATHS
${
HEADER_SEARCH_PATHS
}
NO_DEFAULT_PATH
)
find_path
(
sick_scan_base_INCLUDE_DIR_5 NAMES sick_scan/SickScanConfig.h PATHS
${
HEADER_SEARCH_PATHS
}
NO_DEFAULT_PATH
)
find_path
(
sick_scan_base_INCLUDE_DIR_6 NAMES sick_scan/rosconsole_simu.hpp PATHS
${
HEADER_SEARCH_PATHS
}
NO_DEFAULT_PATH
)
if
(
sick_scan_base_INCLUDE_DIR_0 AND sick_scan_base_INCLUDE_DIR_1 AND sick_scan_base_INCLUDE_DIR_2 AND sick_scan_base_INCLUDE_DIR_3 AND sick_scan_base_INCLUDE_DIR_4 AND sick_scan_base_INCLUDE_DIR_5 AND sick_scan_base_INCLUDE_DIR_6
)
set
(
sick_scan_base_INCLUDE_DIRS
${
sick_scan_base_INCLUDE_DIR_0
}
${
sick_scan_base_INCLUDE_DIR_1
}
${
sick_scan_base_INCLUDE_DIR_2
}
${
sick_scan_base_INCLUDE_DIR_3
}
${
sick_scan_base_INCLUDE_DIR_4
}
${
sick_scan_base_INCLUDE_DIR_5
}
${
sick_scan_base_INCLUDE_DIR_6
}
)
endif
()
message
(
STATUS
"sick_scan_base_INCLUDE_DIRS:
${
sick_scan_base_INCLUDE_DIRS
}
"
)
find_package_handle_standard_args
(
sick_scan_base DEFAULT_MSG sick_scan_base_INCLUDE_DIRS sick_scan_base_LIBRARIES
)
mark_as_advanced
(
sick_scan_base_INCLUDE_DIRS sick_scan_base_LIBRARIES
)
This diff is collapsed.
Click to expand it.
source/RobotAPI/drivers/SickLaserUnit/CMakeLists.txt
+
1
−
2
View file @
4e282ebf
...
...
@@ -16,7 +16,6 @@ armarx_set_target("Library: ${LIB_NAME}")
find_package
(
sick_scan_base
)
armarx_build_if
(
sick_scan_base_FOUND
"sick_scan_base not available"
)
add_definitions
(
-DROSSIMU
)
find_package
(
Boost COMPONENTS system filesystem thread REQUIRED
)
...
...
@@ -40,7 +39,7 @@ armarx_add_component(
# This component
## SickLaserUnitInterfaces # If you defined a component ice interface above.
${
sick_scan_base
_LIBRARIES
}
sick_scan_base
::sick_scan_generic
${
Boost_LIBRARIES
}
SOURCES
...
...
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