Merge pull request ros2#23 from ros2/fix_windows_test_running

extend the library path with the location of the memory tools also
ApexAI · Feb 12, 2016 · 02cc077 · 02cc077
2 parents 4ae588f + 775428d
commit 02cc077
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/rcl/test/CMakeLists.txt b/rcl/test/CMakeLists.txt
@@ -5,8 +5,9 @@ include(rcl_add_custom_gtest.cmake)
 
 set(extra_test_libraries)
 set(extra_test_env)
+set(extra_lib_dirs "${rcl_lib_dir}")
 
-# This subdirectory extends both extra_test_libraries and extra_test_env.
+# This subdirectory extends both extra_test_libraries, extra_test_env, and extra_lib_dirs.
 add_subdirectory(memory_tools)
 
 macro(test_target)
@@ -31,15 +32,15 @@ function(test_target_function)
   rcl_add_custom_gtest(test_allocator${target_suffix}
     SRCS rcl/test_allocator.cpp
     ENV ${extra_test_env}
-    APPEND_LIBRARY_DIRS "${rcl_lib_dir}"
+    APPEND_LIBRARY_DIRS ${extra_lib_dirs}
     LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
     AMENT_DEPENDENCIES ${rmw_implementation}
   )
 
   rcl_add_custom_gtest(test_time${target_suffix}
     SRCS rcl/test_time.cpp
     ENV ${extra_test_env}
-    APPEND_LIBRARY_DIRS "${rcl_lib_dir}"
+    APPEND_LIBRARY_DIRS ${extra_lib_dirs}
     LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
     AMENT_DEPENDENCIES ${rmw_implementation}
   )
@@ -50,39 +51,39 @@ function(test_target_function)
       ${extra_test_env}
       EMPTY_TEST=
       NORMAL_TEST=foo
-    APPEND_LIBRARY_DIRS "${rcl_lib_dir}"
+    APPEND_LIBRARY_DIRS ${extra_lib_dirs}
     LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
     AMENT_DEPENDENCIES ${rmw_implementation}
   )
 
   rcl_add_custom_gtest(test_rcl${target_suffix}
     SRCS rcl/test_rcl.cpp
     ENV ${extra_test_env}
-    APPEND_LIBRARY_DIRS "${rcl_lib_dir}"
+    APPEND_LIBRARY_DIRS ${extra_lib_dirs}
     LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
     AMENT_DEPENDENCIES ${rmw_implementation}
   )
 
   rcl_add_custom_gtest(test_node${target_suffix}
     SRCS rcl/test_node.cpp
     ENV ${extra_test_env}
-    APPEND_LIBRARY_DIRS "${rcl_lib_dir}"
+    APPEND_LIBRARY_DIRS ${extra_lib_dirs}
     LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
     AMENT_DEPENDENCIES ${rmw_implementation}
   )
 
   rcl_add_custom_gtest(test_publisher${target_suffix}
     SRCS rcl/test_publisher.cpp
     ENV ${extra_test_env}
-    APPEND_LIBRARY_DIRS "${rcl_lib_dir}"
+    APPEND_LIBRARY_DIRS ${extra_lib_dirs}
     LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
     AMENT_DEPENDENCIES ${rmw_implementation} "std_msgs"
   )
 
   rcl_add_custom_gtest(test_subscription${target_suffix}
     SRCS rcl/test_subscription.cpp
     ENV ${extra_test_env}
-    APPEND_LIBRARY_DIRS "${rcl_lib_dir}"
+    APPEND_LIBRARY_DIRS ${extra_lib_dirs}
     LIBRARIES ${PROJECT_NAME}${target_suffix} ${extra_test_libraries}
     AMENT_DEPENDENCIES ${rmw_implementation} "std_msgs"
   )

diff --git a/rcl/test/memory_tools/CMakeLists.txt b/rcl/test/memory_tools/CMakeLists.txt
@@ -16,6 +16,7 @@ if(UNIX AND NOT APPLE)
   list(APPEND extra_test_libraries dl)
   list(APPEND extra_test_env DL_PRELOAD=$<TARGET_FILE:${PROJECT_NAME}_memory_tools>)
 endif()
+list(APPEND extra_lib_dirs $<TARGET_FILE_DIR:${PROJECT_NAME}_memory_tools>)
 target_link_libraries(${PROJECT_NAME}_memory_tools ${extra_test_libraries})
 target_compile_definitions(${PROJECT_NAME}_memory_tools
   PRIVATE "RCL_MEMORY_TOOLS_BUILDING_DLL")
@@ -34,3 +35,4 @@ endif()
 
 set(extra_test_libraries ${extra_test_libraries} PARENT_SCOPE)
 set(extra_test_env ${extra_test_env} PARENT_SCOPE)
+set(extra_lib_dirs ${extra_lib_dirs} PARENT_SCOPE)