Skip to content

fix to work with drcsim #201

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.

Sign up for GitHub

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

Open
k-okada wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix to work with drcsim #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfe7d97
[iob/CMakeLists.txt] add link to dl, pthread
k-okada Jul 6, 2015
54001ee
[catin.cmake] atlas_description is catkin package
k-okada Jul 6, 2015
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
3 changes: 1 addition & 2 deletions hrpsys_gazebo_atlas/catkin.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions hrpsys_gazebo_atlas/iob/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down