Skip to content

refactor typesupport #9

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

Merged
merged 1 commit into from
Dec 12, 2015
Merged

refactor typesupport #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions rmw_implementation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
cmake_minimum_required(VERSION 2.8.3)

project(rmw_implementation NONE)
# must be not NONE since some rmw implementation require compiler checks
project(rmw_implementation)

find_package(ament_cmake REQUIRED)
find_package(rmw_implementation_cmake REQUIRED)

if(AMENT_ENABLE_TESTING)
find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies()
endif()

get_default_rmw_implementation(RMW_IMPLEMENTATION)

ament_package(
CONFIG_EXTRAS "rmw_implementation-extras.cmake"
CONFIG_EXTRAS "rmw_implementation-extras.cmake.in"
)
12 changes: 6 additions & 6 deletions rmw_implementation/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_export_depend>ament_cmake</buildtool_export_depend>

<exec_depend>rmw_connext_cpp</exec_depend>
<exec_depend>rmw_connext_dynamic_cpp</exec_depend>
<exec_depend>rmw_fastrtps_cpp</exec_depend>
<exec_depend>rmw_implementation_cmake</exec_depend>
<exec_depend>rmw_opensplice_cpp</exec_depend>
<build_depend>rmw_implementation_cmake</build_depend>

<depend>rmw_connext_cpp</depend>
<depend>rmw_connext_dynamic_cpp</depend>
<depend>rmw_fastrtps_cpp</depend>
<depend>rmw_opensplice_cpp</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down
15 changes: 8 additions & 7 deletions ...mentation/rmw_implementation-extras.cmake → ...tation/rmw_implementation-extras.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# copied from rmw_implementation/rmw_implementation-extras.cmake
# generated from rmw_implementation/rmw_implementation-extras.cmake.in

find_package(rmw_implementation_cmake REQUIRED)
set(RMW_IMPLEMENTATION "@RMW_IMPLEMENTATION@")

get_default_rmw_implementation(_middleware_implementation)
find_package("${_middleware_implementation}" REQUIRED)
message(STATUS "Using RMW implementation: ${RMW_IMPLEMENTATION}")

find_package("${RMW_IMPLEMENTATION}" REQUIRED)

# TODO should never need definitions and include dirs?
list(APPEND rmw_implementation_DEFINITIONS ${${_middleware_implementation}_DEFINITIONS})
list(APPEND rmw_implementation_INCLUDE_DIRS ${${_middleware_implementation}_INCLUDE_DIRS})
list(APPEND rmw_implementation_LIBRARIES ${${_middleware_implementation}_LIBRARIES})
list(APPEND rmw_implementation_DEFINITIONS ${${RMW_IMPLEMENTATION}_DEFINITIONS})
list(APPEND rmw_implementation_INCLUDE_DIRS ${${RMW_IMPLEMENTATION}_INCLUDE_DIRS})
list(APPEND rmw_implementation_LIBRARIES ${${RMW_IMPLEMENTATION}_LIBRARIES})