From 97322affd20ec18999e4e2899af16ef31f7ababe Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 1 Aug 2014 17:03:47 -0700 Subject: [PATCH] remove local paths --- ros_dds_connext_dynamic/CMakeLists.txt | 37 ++++---------------------- ros_dds_connext_static/CMakeLists.txt | 14 ++-------- 2 files changed, 7 insertions(+), 44 deletions(-) diff --git a/ros_dds_connext_dynamic/CMakeLists.txt b/ros_dds_connext_dynamic/CMakeLists.txt index 968d5e1..c82d968 100644 --- a/ros_dds_connext_dynamic/CMakeLists.txt +++ b/ros_dds_connext_dynamic/CMakeLists.txt @@ -7,40 +7,14 @@ find_package(ros_middleware_interface REQUIRED) find_package(rosidl_generator_cpp REQUIRED) find_package(ndds_cpp REQUIRED) -#set(CONNEXT_INCLUDE_DIRS ${ndds_cpp_INCLUDE_DIRS}) -set(CONNEXT_INCLUDE_DIRS - "/home/dthomas/RTI/ndds.5.1.0/include/ndds" - "/home/dthomas/RTI/ndds.5.1.0/include" -) -#set(CONNEXT_LIBRARIES ${ndds_cpp_LIBRARIES}) -set(CONNEXT_LIBRARIES - "/home/dthomas/RTI/ndds.5.1.0/lib/x64Linux2.6gcc4.4.5/libnddscppz.a" - "/home/dthomas/RTI/ndds.5.1.0/lib/x64Linux2.6gcc4.4.5/libnddscz.a" - "/home/dthomas/RTI/ndds.5.1.0/lib/x64Linux2.6gcc4.4.5/libnddscorez.a" -) +set(CONNEXT_INCLUDE_DIRS ${ndds_cpp_INCLUDE_DIRS}) +set(CONNEXT_LIBRARIES ${ndds_cpp_LIBRARIES}) set(CONNEXT_DEFINITIONS ${ndds_cpp_DEFINITIONS}) -set(_dds_vendor "$ENV{ROS_DDS_IMPLEMENTATION}") -set(_dds_type "$ENV{ROS_DDS_TYPE}") -if("${_dds_type}" STREQUAL "dynamic") - find_package(ros_dds_cpp_dynamic_typesupport REQUIRED) - ament_export_dependencies(ros_dds_cpp_dynamic_typesupport) - include_directories(${ros_dds_cpp_dynamic_typesupport_INCLUDE_DIRS}) -elseif("${_dds_type}" STREQUAL "static") - if("${_dds_vendor}" STREQUAL "connext") - find_package(ros_dds_connext_static REQUIRED) - ament_export_definitions(${CONNEXT_DEFINITIONS}) - ament_export_dependencies(ros_dds_connext_static) - include_directories(${ros_dds_connext_static_INCLUDE_DIRS}) - elseif("${_dds_vendor}" STREQUAL "opensplice") - message(FATAL_ERROR "The DDS implementation '${_dds_vendor}' does not yet support the type '${_dds_type}'.") - else() - message(FATAL_ERROR "Set the environment variable 'ROS_DDS_IMPLEMENTATION' to either 'connext' or 'opensplice'.") - endif() -else() - message(FATAL_ERROR "Set the environment variable 'ROS_DDS_TYPE' to either 'dynamic' or 'static'.") -endif() +find_package(ros_dds_cpp_dynamic_typesupport REQUIRED) +ament_export_dependencies(ros_dds_cpp_dynamic_typesupport) +include_directories(${ros_dds_cpp_dynamic_typesupport_INCLUDE_DIRS}) ament_export_dependencies(ros_middleware_interface rosidl_generator_cpp) @@ -50,7 +24,6 @@ ament_export_libraries(ros_dds_connext_dynamic dl pthread) ament_package() include_directories(${ros_middleware_interface_INCLUDE_DIRS} ${rosidl_generator_cpp_INCLUDE_DIRS} ${CONNEXT_INCLUDE_DIRS}) -link_directories("/home/dthomas/RTI/ndds.5.1.0/lib/x64Linux2.6gcc4.4.5") add_definitions(${CONNEXT_DEFINITIONS}) add_library(ros_dds_connext_dynamic SHARED src/functions.cpp) target_link_libraries(ros_dds_connext_dynamic ${std_msgs_LIBRARIES} ${CONNEXT_LIBRARIES}) diff --git a/ros_dds_connext_static/CMakeLists.txt b/ros_dds_connext_static/CMakeLists.txt index fc1c4b6..66defd0 100644 --- a/ros_dds_connext_static/CMakeLists.txt +++ b/ros_dds_connext_static/CMakeLists.txt @@ -8,17 +8,8 @@ find_package(rosidl_generator_cpp REQUIRED) find_package(rosidl_generator_dds_connext_cpp REQUIRED) find_package(ndds_cpp REQUIRED) -#set(CONNEXT_INCLUDE_DIRS ${ndds_cpp_INCLUDE_DIRS}) -set(CONNEXT_INCLUDE_DIRS - "/home/dthomas/RTI/ndds.5.1.0/include/ndds" - "/home/dthomas/RTI/ndds.5.1.0/include" -) -#set(CONNEXT_LIBRARIES ${ndds_cpp_LIBRARIES}) -set(CONNEXT_LIBRARIES - "/home/dthomas/RTI/ndds.5.1.0/lib/x64Linux2.6gcc4.4.5/libnddscppz.a" - "/home/dthomas/RTI/ndds.5.1.0/lib/x64Linux2.6gcc4.4.5/libnddscz.a" - "/home/dthomas/RTI/ndds.5.1.0/lib/x64Linux2.6gcc4.4.5/libnddscorez.a" -) +set(CONNEXT_INCLUDE_DIRS ${ndds_cpp_INCLUDE_DIRS}) +set(CONNEXT_LIBRARIES ${ndds_cpp_LIBRARIES}) set(CONNEXT_DEFINITIONS ${ndds_cpp_DEFINITIONS}) ament_export_definitions(${CONNEXT_DEFINITIONS}) @@ -33,7 +24,6 @@ ament_package( ) include_directories(include ${ros_middleware_interface_INCLUDE_DIRS} ${rosidl_generator_cpp_INCLUDE_DIRS} ${rosidl_generator_dds_connext_cpp_INCLUDE_DIRS} ${CONNEXT_INCLUDE_DIRS}) -link_directories("/home/dthomas/RTI/ndds.5.1.0/lib/x64Linux2.6gcc4.4.5") add_definitions(${CONNEXT_DEFINITIONS}) add_library(ros_dds_connext_static SHARED src/functions.cpp) target_link_libraries(ros_dds_connext_static ${std_msgs_LIBRARIES} ${rosidl_generator_dds_connext_cpp_LIBRARIES} ${CONNEXT_LIBRARIES})