From 4d14a3766b14e13cca2c33033da824e595b88e4c Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Tue, 12 Nov 2024 00:22:59 +0100 Subject: [PATCH 1/2] Update CMakeLists.txt --- moveit_core/constraint_samplers/CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/moveit_core/constraint_samplers/CMakeLists.txt b/moveit_core/constraint_samplers/CMakeLists.txt index 25cda7dc66..fc0e7dbb16 100644 --- a/moveit_core/constraint_samplers/CMakeLists.txt +++ b/moveit_core/constraint_samplers/CMakeLists.txt @@ -30,13 +30,11 @@ if(BUILD_TESTING) include_directories(SYSTEM ${orocos_kdl_INCLUDE_DIRS} ${angles_INCLUDE_DIRS} ${tf2_kdl_INCLUDE_DIRS}) - if(WIN32) - # set(APPEND_LIBRARY_DIRS - # "$;$") - else() - set(APPEND_LIBRARY_DIRS - "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_BINARY_DIR}/../utils;${CMAKE_CURRENT_BINARY_DIR}/../robot_state;${CMAKE_CURRENT_BINARY_DIR}/../planning_scene;${CMAKE_CURRENT_BINARY_DIR}/../robot_model;${CMAKE_CURRENT_BINARY_DIR}/../kinematics_constraint" - ) + set(APPEND_LIBRARY_DIRS + "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_BINARY_DIR}/../utils;${CMAKE_CURRENT_BINARY_DIR}/../robot_state; + ${CMAKE_CURRENT_BINARY_DIR}/../planning_scene;${CMAKE_CURRENT_BINARY_DIR}/../robot_model; + ${CMAKE_CURRENT_BINARY_DIR}/../kinematics_constraint" + ) endif() ament_add_gmock(test_constraint_samplers test/test_constraint_samplers.cpp From fa10f8c05121b2e35b899442d481c3ca2e9d62d7 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Tue, 12 Nov 2024 00:31:47 +0100 Subject: [PATCH 2/2] Update CMakeLists.txt --- moveit_core/constraint_samplers/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/moveit_core/constraint_samplers/CMakeLists.txt b/moveit_core/constraint_samplers/CMakeLists.txt index fc0e7dbb16..904ae21911 100644 --- a/moveit_core/constraint_samplers/CMakeLists.txt +++ b/moveit_core/constraint_samplers/CMakeLists.txt @@ -35,7 +35,6 @@ if(BUILD_TESTING) ${CMAKE_CURRENT_BINARY_DIR}/../planning_scene;${CMAKE_CURRENT_BINARY_DIR}/../robot_model; ${CMAKE_CURRENT_BINARY_DIR}/../kinematics_constraint" ) - endif() ament_add_gmock(test_constraint_samplers test/test_constraint_samplers.cpp test/pr2_arm_kinematics_plugin.cpp test/pr2_arm_ik.cpp)