Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 01caa0b

Browse files
committed
Shorten some excessively long lines of CMake
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 ecce83e commit 01caa0b

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

rmw_connext_cpp/CMakeLists.txt

+14-5
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,16 @@ find_package(rcutils REQUIRED)
4242
find_package(rosidl_typesupport_connext_c)
4343
if(NOT rosidl_typesupport_connext_c_FOUND)
4444
ament_package()
45-
message(WARNING "Could not find ROSIDL TypeSupport for Connext (rosidl_typesupport_connext_c) - skipping '${PROJECT_NAME}'")
45+
message(WARNING
46+
"Could not find ROSIDL TypeSupport for Connext (rosidl_typesupport_connext_c) - skipping '${PROJECT_NAME}'")
4647
return()
4748
endif()
4849

4950
find_package(rosidl_typesupport_connext_cpp)
5051
if(NOT rosidl_typesupport_connext_cpp_FOUND)
5152
ament_package()
52-
message(WARNING "Could not find ROSIDL TypeSupport for Connext (rosidl_typesupport_connext_cpp) - skipping '${PROJECT_NAME}'")
53+
message(WARNING
54+
"Could not find ROSIDL TypeSupport for Connext (rosidl_typesupport_connext_cpp) - skipping '${PROJECT_NAME}'")
5355
return()
5456
endif()
5557

@@ -93,7 +95,8 @@ add_custom_command(
9395
# server is in rosidl_typesupport_connext_cpp, and that uses a different set of arguments.
9496
# We don't want to accidentally connect to that other version of the server that might
9597
# still be running.
96-
COMMAND "${Connext_DDSGEN}" -language C++ -unboundedSupport "connext_static_serialized_data.idl" -d ${generated_directory}
98+
COMMAND
99+
"${Connext_DDSGEN}" -language C++ -unboundedSupport "connext_static_serialized_data.idl" -d ${generated_directory}
97100
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/resources"
98101
COMMENT "Generating serialized type support for RTI Connext (using '${Connext_DDSGEN}')"
99102
VERBATIM
@@ -107,7 +110,9 @@ find_file(connext_version_header "ndds_version.h"
107110
if(NOT connext_version_header)
108111
message(FATAL_ERROR "Failed to find 'ndds/ndds_version.h' in '${Connext_INCLUDE_DIRS}'")
109112
endif()
110-
file(STRINGS "${connext_version_header}" connext_define_major_version LIMIT_COUNT 1 REGEX "#define RTI_DDS_VERSION_MAJOR [0-9]+")
113+
file(STRINGS "${connext_version_header}" connext_define_major_version
114+
LIMIT_COUNT 1
115+
REGEX "#define RTI_DDS_VERSION_MAJOR [0-9]+")
111116
if("${connext_define_major_version}" STREQUAL "")
112117
message(FATAL_ERROR "Failed to find '#define RTI_DDS_VERSION_MAJOR' in '${connext_version_header}'")
113118
endif()
@@ -139,7 +144,11 @@ set(patched_files
139144
)
140145
add_custom_command(
141146
OUTPUT ${patched_files}
142-
COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/bin/apply-patch.py" --input ${generated_files} --patch ${patch_files} --out ${patched_files}
147+
COMMAND
148+
${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/bin/apply-patch.py"
149+
--input ${generated_files}
150+
--patch ${patch_files}
151+
--out ${patched_files}
143152
DEPENDS ${generated_files}
144153
COMMENT "Patching serialized type support for RTI Connext"
145154
VERBATIM

0 commit comments

Comments
 (0)