niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #194 from ros2/get_rclcpp_info_cleanup

Browse source 
Cleanup in get_rclcpp_information
This commit is contained in:
Jackie Kay 2016-02-11 15:07:29 -08:00
commit 6fbf3f8c5f
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rclcpp/CMakeLists.txt
View file

@ -65,6 +65,7 @@ endmacro()
call_for_each_rmw_implementation(target GENERATE_DEFAULT) call_for_each_rmw_implementation(target GENERATE_DEFAULT)
ament_export_dependencies(ament_cmake)
ament_export_dependencies(rcl_interfaces) ament_export_dependencies(rcl_interfaces)
ament_export_dependencies(rmw) ament_export_dependencies(rmw)
ament_export_dependencies(rmw_implementation) ament_export_dependencies(rmw_implementation)

6
rclcpp/cmake/get_rclcpp_information.cmake
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
# #
# Get all information abut rclcpp for a specific RMW implementation. # Get all information about rclcpp for a specific RMW implementation.
# #
# It sets the common variables _DEFINITIONS, _INCLUDE_DIRS and _LIBRARIES # It sets the common variables _DEFINITIONS, _INCLUDE_DIRS and _LIBRARIES
# with the given prefix. # with the given prefix.
@ -29,7 +29,7 @@ macro(get_rclcpp_information rmw_implementation var_prefix)
set(${var_prefix}_FOUND TRUE) set(${var_prefix}_FOUND TRUE)
# include directories # include directories
set(${var_prefix}_INCLUDE_DIRS normalize_path(${var_prefix}_INCLUDE_DIRS
"${rclcpp_DIR}/../../../include") "${rclcpp_DIR}/../../../include")
# libraries # libraries
@ -49,7 +49,7 @@ macro(get_rclcpp_information rmw_implementation var_prefix)
) )
if(NOT _lib) if(NOT _lib)
# warn about not existing library and ignore it # warn about not existing library and ignore it
message(FATAL_ERROR "Package 'rclcpp' doesn't contain the library '${_library_target}'") message(WARNING "Package 'rclcpp' doesn't contain the library '${_library_target}'")
elseif(NOT IS_ABSOLUTE "${_lib}") elseif(NOT IS_ABSOLUTE "${_lib}")
# the found library must be an absolute path # the found library must be an absolute path
message(FATAL_ERROR "Package 'rclcpp' found the library '${_library_target}' at '${_lib}' which is not an absolute path") message(FATAL_ERROR "Package 'rclcpp' found the library '${_library_target}' at '${_lib}' which is not an absolute path")

2
rclcpp/package.xml
View file

@ -18,6 +18,8 @@
<depend>rmw_implementation</depend> <depend>rmw_implementation</depend>
<exec_depend>ament_cmake</exec_depend>
<test_depend>ament_cmake_gtest</test_depend> <test_depend>ament_cmake_gtest</test_depend>
<test_depend>ament_lint_auto</test_depend> <test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend> <test_depend>ament_lint_common</test_depend>