← Back to branch summary

~hrg/hrg-packaging/gazebo-ros-pkgs

« back to all changes in this revision

Viewing changes to gazebo_ros_control/CMakeLists.txt

  • Committer: GitHub
  • Author(s): Jose Luis Rivero
  • Date: 2017-03-03 18:56:20 UTC
  • Revision ID: git-v1:6c9786dbbaf65f345b52cfb83414323c09e32f65
Revert catkin warnings to fix regressions (problems with catkin -lpthreads errors)

For reference and reasons, please check:
https://discourse.ros.org/t/need-to-sync-new-release-of-rqt-topic-indigo-jade-kinetic/1410/4

* Revert "Fix gazebo catkin warning, cleanup CMakeLists (#537)"
This reverts commit 5a0305fcb97864b66bc2e587fc0564435b4f2034.

* Revert "Fix gazebo and sdformat catkin warnings"
This reverts commit 11f95d25dcd32faccd2401d45c722f7794c7542c.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gazebo_ros_control/CMakeLists.txt
16
16
)
17
17
 
18
18
# Depend on system install of Gazebo
19
 
find_package(GAZEBO REQUIRED)
 
19
find_package(gazebo REQUIRED)
20
20
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GAZEBO_CXX_FLAGS}")
21
21
 
22
 
find_package(Boost REQUIRED COMPONENTS thread)
23
 
 
24
22
catkin_package(
25
23
  CATKIN_DEPENDS
26
24
    roscpp
33
31
    joint_limits_interface
34
32
    urdf
35
33
    angles
36
 
  DEPENDS
37
 
    #GAZEBO  # Re-enable after issue resolved:
38
 
    # https://bitbucket.org/osrf/gazebo/issues/2198/gazebo7-linking-error-with-cmake-catkin
39
 
  INCLUDE_DIRS
40
 
    include
41
 
  LIBRARIES
42
 
    ${PROJECT_NAME}
43
 
    default_robot_hw_sim
 
34
  INCLUDE_DIRS include
 
35
  LIBRARIES ${PROJECT_NAME} default_robot_hw_sim
 
36
  DEPENDS gazebo
44
37
)
45
38
 
46
39
link_directories(
53
46
  ${catkin_INCLUDE_DIRS}
54
47
  ${GAZEBO_INCLUDE_DIRS}
55
48
)
 
49
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GAZEBO_CXX_FLAGS}")
56
50
 
57
51
## Libraries
58
52
add_library(${PROJECT_NAME} src/gazebo_ros_control_plugin.cpp)
64
58
## Install
65
59
install(TARGETS ${PROJECT_NAME} default_robot_hw_sim
66
60
  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
67
 
)
 
61
  )
68
62
 
69
63
install(DIRECTORY include/${PROJECT_NAME}/
70
64
  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
71
 
)
 
65
  )
72
66
 
73
67
install(FILES robot_hw_sim_plugins.xml
74
68
  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
75
 
)
 
69
  )
 
70