From 926da819137cb21f697dd076d9da40ea2894b704 Mon Sep 17 00:00:00 2001
From: Mikael Arguedas <mikael.arguedas@gmail.com>
Date: Mon, 29 Jul 2019 20:16:36 +0200
Subject: [PATCH] remove unused CMake code (#475)

* remove copy-n-paste CMake code

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>

* fixup rmw_implementation_cmake dependency

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
---
 rcl_action/CMakeLists.txt | 17 -----------------
 rcl_action/package.xml    |  1 +
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/rcl_action/CMakeLists.txt b/rcl_action/CMakeLists.txt
index b32b8ed..f033b23 100644
--- a/rcl_action/CMakeLists.txt
+++ b/rcl_action/CMakeLists.txt
@@ -9,7 +9,6 @@ find_package(action_msgs REQUIRED)
 find_package(rcl REQUIRED)
 find_package(rcutils REQUIRED)
 find_package(rmw REQUIRED)
-find_package(rmw_implementation_cmake REQUIRED)
 
 include_directories(
   include
@@ -110,12 +109,9 @@ if(BUILD_TESTING)
     ament_add_gtest(
       "${target}${target_suffix}" ${ARGN}
       TIMEOUT 60
-      APPEND_LIBRARY_DIRS "${append_library_dirs}"
       ENV
       RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
       RMW_IMPLEMENTATION=${rmw_implementation}
-      ROS_SECURITY_ROOT_DIRECTORY="${VALID_ROS_SECURITY_ROOT_DIRECTORY}"
-      PATH="${TEST_PATH}"
     )
     if(TARGET ${target}${target_suffix})
       target_compile_definitions(${target}${target_suffix}
@@ -135,19 +131,6 @@ if(BUILD_TESTING)
   endfunction()
 
   macro(targets)
-    set(ENV_PATH "$ENV{PATH}")
-    file(TO_CMAKE_PATH "${ENV_PATH}" ENV_PATH)
-    set(TEST_PATH "${ENV_PATH}")
-    if(rmw_implementation STREQUAL "rmw_connext_cpp")
-      if(UNIX AND NOT APPLE)
-        set(RTI_BIN_PATH "$ENV{RTI_OPENSSL_BIN}")
-        file(TO_CMAKE_PATH "${RTI_BIN_PATH}" RTI_BIN_PATH)
-        set(TEST_PATH "${RTI_BIN_PATH};${ENV_PATH}")
-        if(NOT WIN32)
-          string(REPLACE ";" ":" TEST_PATH "${TEST_PATH}")
-        endif()
-      endif()
-    endif()
     custom_test_c(test_action_communication
       "test/rcl_action/test_action_communication.cpp")
     custom_test_c(test_action_interaction
diff --git a/rcl_action/package.xml b/rcl_action/package.xml
index 8a14846..60c404f 100644
--- a/rcl_action/package.xml
+++ b/rcl_action/package.xml
@@ -25,6 +25,7 @@
   <test_depend>ament_lint_common</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>osrf_testing_tools_cpp</test_depend>
+  <test_depend>rmw_implementation_cmake</test_depend>
   <test_depend>test_msgs</test_depend>
 
   <export>