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

add pthread for link only for raling 64bit #168

Merged
merged 2 commits into from
Jan 8, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions eusgazebo/euslisp/eusgazebo.l
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
(load "package://eusgazebo/euslisp/eusgazebo-util.l")
(load "package://eusgazebo/euslisp/mass-property-util.l")

(ros::load-ros-manifest "trajectory_msgs")
(ros::load-ros-manifest "gazebo_msgs")

(ros::roseus "eusgazebo_client")
Expand Down
2 changes: 1 addition & 1 deletion hrpsys_gazebo_general/iob/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set_target_properties(RobotHardware_gazebo PROPERTIES LIBRARY_OUTPUT_DIRECTORY $
set_target_properties(RobotHardware_gazebo PROPERTIES OUTPUT_NAME RobotHardware)

add_executable(RobotHardwareComp_gazebo ${ROBOTHARDWARE_SOURCE}/RobotHardwareComp.cpp ${comp_source})
target_link_libraries(RobotHardwareComp_gazebo ${libs} ${omniorb_LIBRARIES} ${omnidynamic_LIBRARIES} RTC coil dl)
target_link_libraries(RobotHardwareComp_gazebo ${libs} ${omniorb_LIBRARIES} ${omnidynamic_LIBRARIES} RTC coil dl pthread)
set_target_properties(RobotHardwareComp_gazebo PROPERTIES OUTPUT_NAME RobotHardwareComp)

add_library(hrpEC_gazebo SHARED ${HRPEC_SOURCE}/hrpEC.cpp ${HRPEC_SOURCE}/hrpEC-common.cpp)
Expand Down