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

Revert "Export rmw_fastrtps_cpp target" #200

Merged
merged 2 commits into from
May 7, 2018
+8 −7
Merged

Revert "Export rmw_fastrtps_cpp target" #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a84fd3f
Revert "Support access control (#197)"
mikaelarguedas May 7, 2018
217a309
Revert "Export rmw_fastrtps_cpp target (#198)"
mikaelarguedas May 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions rmw_fastrtps_cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,13 @@ PRIVATE "RMW_FASTRTPS_CPP_BUILDING_LIBRARY")

# specific order: dependents before dependencies
ament_export_include_directories(include)
ament_export_interfaces(export_rmw_fastrtps_cpp)
ament_export_libraries(rmw_fastrtps_cpp)

ament_export_dependencies(rosidl_typesupport_introspection_cpp)
ament_export_dependencies(rosidl_typesupport_introspection_c)
ament_export_dependencies(rosidl_generator_c)
ament_export_dependencies(rcutils)
ament_export_dependencies(rmw)
ament_export_dependencies(fastrtps_cmake_module)
ament_export_dependencies(fastcdr)
ament_export_dependencies(fastrtps)
ament_export_dependencies(FastRTPS)

register_rmw_implementation(
"c:rosidl_typesupport_c:rosidl_typesupport_introspection_c"
Expand All @@ -132,7 +127,6 @@ install(

install(
TARGETS rmw_fastrtps_cpp
EXPORT export_rmw_fastrtps_cpp
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
Expand Down
9 changes: 8 additions & 1 deletion rmw_fastrtps_cpp/rmw_fastrtps_cpp-extras.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,11 @@

# copied from rmw_fastrtps_cpp/rmw_fastrtps_cpp-extras.cmake

list(APPEND rmw_fastrtps_cpp_LIBRARIES rmw_fastrtps_cpp::rmw_fastrtps_cpp)
find_package(fastrtps_cmake_module REQUIRED)
find_package(fastcdr REQUIRED CONFIG)
find_package(fastrtps REQUIRED CONFIG)
find_package(FastRTPS REQUIRED MODULE)

list(APPEND rmw_fastrtps_cpp_INCLUDE_DIRS ${FastRTPS_INCLUDE_DIR})
# specific order: dependents before dependencies
list(APPEND rmw_fastrtps_cpp_LIBRARIES fastrtps fastcdr)