From bfe7d97902ab0895f35089d17a625802f0872adc Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Mon, 6 Jul 2015 17:22:14 +0900 Subject: [PATCH 1/2] [iob/CMakeLists.txt] add link to dl, pthread --- hrpsys_gazebo_atlas/iob/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hrpsys_gazebo_atlas/iob/CMakeLists.txt b/hrpsys_gazebo_atlas/iob/CMakeLists.txt index 6bcbb8ef..9af73cd6 100644 --- a/hrpsys_gazebo_atlas/iob/CMakeLists.txt +++ b/hrpsys_gazebo_atlas/iob/CMakeLists.txt @@ -4,7 +4,7 @@ add_definitions(-DHRPSYS_PACKAGE_VERSION=\"\\"${CPACK_PACKAGE_VERSION_MAJOR}.${C add_library(hrpIo_atlas SHARED iob.cpp) if (NOT APPLE AND NOT QNXNTO) - target_link_libraries(hrpIo_atlas rt) + target_link_libraries(hrpIo_atlas rt dl pthread) endif() target_link_libraries(hrpIo_atlas roscpp rostime) @@ -21,7 +21,7 @@ set_target_properties(RobotHardware_atlas PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${ set_target_properties(RobotHardware_atlas PROPERTIES OUTPUT_NAME RobotHardware) add_executable(RobotHardwareComp_atlas ${ROBOTHARDWARE_SOURCE}/RobotHardwareComp.cpp ${comp_source}) -target_link_libraries(RobotHardwareComp_atlas ${libs} ${omniorb_LIBRARIES} ${omnidynamic_LIBRARIES} RTC coil) +target_link_libraries(RobotHardwareComp_atlas ${libs} ${omniorb_LIBRARIES} ${omnidynamic_LIBRARIES} RTC coil dl) set_target_properties(RobotHardwareComp_atlas PROPERTIES OUTPUT_NAME RobotHardwareComp) install(TARGETS RobotHardwareComp_atlas RobotHardware_atlas hrpIo_atlas From 54001ee042ff1a4a2abca0d5c502eafd6c0c312d Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Mon, 6 Jul 2015 17:22:55 +0900 Subject: [PATCH 2/2] [catin.cmake] atlas_description is catkin package --- hrpsys_gazebo_atlas/catkin.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hrpsys_gazebo_atlas/catkin.cmake b/hrpsys_gazebo_atlas/catkin.cmake index ae9ccd47..ffead1ab 100644 --- a/hrpsys_gazebo_atlas/catkin.cmake +++ b/hrpsys_gazebo_atlas/catkin.cmake @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3) project(hrpsys_gazebo_atlas) -find_package(catkin REQUIRED COMPONENTS hrpsys_gazebo_general message_generation) +find_package(catkin REQUIRED COMPONENTS hrpsys_gazebo_general message_generation atlas_description) catkin_python_setup() add_message_files( @@ -30,7 +30,6 @@ find_package(PkgConfig) pkg_check_modules(collada_urdf_jsk_patch collada_urdf_jsk_patch) # check if atlas description is installed -pkg_check_modules(atlas_description atlas_description) if(atlas_description_FOUND) if(EXISTS ${atlas_description_SOURCE_DIR}) set(atlas_description_PACKAGE_PATH ${atlas_description_SOURCE_DIR})