Skip to content

Commit 57befb8

Browse files
authored
Shorten some excessively long lines of CMake (#571)
The line length enforcement in ament_lint_cmake has been broken for some time, but will be fixed by ament/ament_lint#236. This change brings this package into compliance with a 120 column limit. Signed-off-by: Scott K Logan <logans@cottsay.net>
1 parent 279d129 commit 57befb8

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

rosidl_cmake/cmake/rosidl_cmake_export_typesupport_libraries-extras.cmake.in

+5-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ if(NOT _exported_typesupport_libraries STREQUAL "")
2323

2424
if(NOT _lib)
2525
# the library wasn't found
26-
message(FATAL_ERROR "Package '@PROJECT_NAME@' exports the typesupport library '${_library}' which couldn't be found")
26+
message(FATAL_ERROR
27+
"Package '@PROJECT_NAME@' exports the typesupport library '${_library}' which couldn't be found")
2728
elseif(NOT IS_ABSOLUTE "${_lib}")
2829
# the found library must be an absolute path
29-
message(FATAL_ERROR "Package '@PROJECT_NAME@' found the typesupport library '${_library}' at '${_lib}' which is not an absolute path")
30+
message(FATAL_ERROR
31+
"Package '@PROJECT_NAME@' found the typesupport library '${_library}' at '${_lib}' "
32+
"which is not an absolute path")
3033
elseif(NOT EXISTS "${_lib}")
3134
# the found library must exist
3235
message(FATAL_ERROR "Package '@PROJECT_NAME@' found the typesupport library '${_lib}' which doesn't exist")

rosidl_cmake/cmake/rosidl_target_interfaces.cmake

+4-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@ function(rosidl_target_interfaces target interface_target typesupport_name)
3434
"rosidl_target_interfaces() called with unused arguments: ${ARGN}")
3535
endif()
3636
if(NOT TARGET ${target})
37-
message(FATAL_ERROR "rosidl_target_interfaces() the first argument '${target}' must be a valid target name")
37+
message(FATAL_ERROR
38+
"rosidl_target_interfaces() the first argument '${target}' must be a valid target name")
3839
endif()
3940
if(NOT TARGET ${interface_target})
40-
message(FATAL_ERROR "rosidl_target_interfaces() the second argument '${interface_target}' must be a valid target name")
41+
message(FATAL_ERROR
42+
"rosidl_target_interfaces() the second argument '${interface_target}' must be a valid target name")
4143
endif()
4244
set(typesupport_target "${interface_target}__${typesupport_name}")
4345
if(NOT TARGET ${typesupport_target})

rosidl_runtime_c/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ if(BUILD_TESTING)
5353
find_package(ament_lint_auto REQUIRED)
5454
find_package(performance_test_fixture REQUIRED)
5555
# Give cppcheck hints about macro definitions coming from outside this package
56-
get_target_property(ament_cmake_cppcheck_ADDITIONAL_INCLUDE_DIRS performance_test_fixture::performance_test_fixture INTERFACE_INCLUDE_DIRECTORIES)
56+
get_target_property(ament_cmake_cppcheck_ADDITIONAL_INCLUDE_DIRS performance_test_fixture::performance_test_fixture
57+
INTERFACE_INCLUDE_DIRECTORIES)
5758
ament_lint_auto_find_test_dependencies()
5859

5960
# For gtest

0 commit comments

Comments
 (0)