Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Force extension points to be registered in order #485

Merged
merged 3 commits into from May 14, 2020
Merged

Force extension points to be registered in order #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
413cbca
Force extension points to be registered in order
ivanpauno May 12, 2020
ee57927
Don't introduce buildtool export dependencies on rosidl_generator_c/c…
ivanpauno May 13, 2020
7c1af45
Address peer review comments
ivanpauno May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...upport_introspection_c/cmake/rosidl_typesupport_introspection_c_generate_interfaces.cmake
View file
Open in desktop
Expand Up @@ -12,6 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

if(NOT rosidl_generator_c_FOUND)
message(FATAL_ERROR
"'rosidl_generator_c' not found when executing "
"'rosidl_typesupport_introspection_c' extension.")
endif()

set(_output_path
"${CMAKE_CURRENT_BINARY_DIR}/rosidl_typesupport_introspection_c/${PROJECT_NAME}")
set(_generated_header_files "")
Expand Down
3 changes: 3 additions & 0 deletions rosidl_typesupport_introspection_c/rosidl_typesupport_introspection_c-extras.cmake.in
View file
Open in desktop
Expand Up @@ -6,6 +6,9 @@
set(rosidl_typesupport_introspection_c_LIBRARY_TYPE
"@rosidl_typesupport_introspection_c_LIBRARY_TYPE@")

# Make sure rosidl_generator_c extension point is registered first
find_package(rosidl_generator_c QUIET)

find_package(ament_cmake_core QUIET REQUIRED)
ament_register_extension(
"rosidl_generate_idl_interfaces"
Expand Down
6 changes: 6 additions & 0 deletions ...rt_introspection_cpp/cmake/rosidl_typesupport_introspection_cpp_generate_interfaces.cmake
View file
Open in desktop
Expand Up @@ -12,6 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

if(NOT rosidl_generator_c_FOUND)
message(FATAL_ERROR
"'rosidl_generator_cpp' not found when executing "
"'rosidl_typesupport_introspection_cpp' extension.")
endif()

set(_output_path
"${CMAKE_CURRENT_BINARY_DIR}/rosidl_typesupport_introspection_cpp/${PROJECT_NAME}")
set(_generated_header_files "")
Expand Down
3 changes: 3 additions & 0 deletions rosidl_typesupport_introspection_cpp/rosidl_typesupport_introspection_cpp-extras.cmake.in
View file
Open in desktop
Expand Up @@ -6,6 +6,9 @@
set(rosidl_typesupport_introspection_cpp_LIBRARY_TYPE
"@rosidl_typesupport_introspection_cpp_LIBRARY_TYPE@")

# Make sure extension points are registered in order
find_package(rosidl_generator_cpp QUIET)

find_package(ament_cmake_core QUIET REQUIRED)
ament_register_extension(
"rosidl_generate_idl_interfaces"
Expand Down