Skip to content
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.

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

Update master #123

Merged
merged 22 commits into from
Jul 2, 2019
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
kinematic_constraints cmakelist
  • Loading branch information
ahcorde authored and anasarrak committed Jun 26, 2019

Verified

This commit was signed with the committer’s verified signature.
vkubiv Volodymyr Kubiv
commit e1c34ca640276f6d48b6ab08a0820b2c575bec7a
7 changes: 3 additions & 4 deletions moveit_core/kinematic_constraints/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
set(MOVEIT_LIB_NAME moveit_kinematic_constraints)

if(WIN32)
# set(append_library_dirs "$<TARGET_FILE_DIR:${PROJECT_NAME}>;$<TARGET_FILE_DIR:${PROJECT_NAME}_TestPlugins1>")
# set(append_library_dirs "$<TARGET_FILE_DIR:${PROJECT_NAME}>;$<TARGET_FILE_DIR:${PROJECT_NAME}_TestPlugins1>")
else()
set(append_library_dirs "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_BINARY_DIR}/../utils;${CMAKE_CURRENT_BINARY_DIR}/../robot_model;${CMAKE_CURRENT_BINARY_DIR}/../robot_state;${CMAKE_CURRENT_BINARY_DIR}/../collision_detection_fcl")
set(append_library_dirs "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_BINARY_DIR}/../utils;${CMAKE_CURRENT_BINARY_DIR}/../robot_model;${CMAKE_CURRENT_BINARY_DIR}/../robot_state;${CMAKE_CURRENT_BINARY_DIR}/../collision_detection_fcl")
endif()

add_library(${MOVEIT_LIB_NAME} SHARED
@@ -44,8 +44,7 @@ if(BUILD_TESTING)
include_directories(${moveit_resources_INCLUDE_DIRS})

ament_add_gtest(test_constraints test/test_constraints.cpp
APPEND_LIBRARY_DIRS "${append_library_dirs}"
)
APPEND_LIBRARY_DIRS "${append_library_dirs}")

target_link_libraries(test_constraints
moveit_kinematic_constraints