Revision 96284eda

View differences:

client/cpp/CMakeLists.txt
70 70
find_package(catkin)
71 71
IF (catkin_FOUND)
72 72
    SET(ROS_FOUND 1)
73
    find_package(catkin REQUIRED COMPONENTS roscpp std_msgs sensor_msgs message_generation genmsg actionlib)
74 73

  
75 74
    catkin_package(
76 75
        INCLUDE_DIRS include
76
        LIBRARIES ${HLRC_CLIENT_LIBNAME}
77 77
    )
78 78

  
79
    find_package(catkin REQUIRED COMPONENTS roscpp std_msgs sensor_msgs message_generation genmsg hlrc_server humotion tf2_eigen actionlib)
80

  
79 81
    message(STATUS "ROS Support is ON")
80 82
    add_definitions(-DROS_SUPPORT=1)
81 83
    include_directories(${catkin_INCLUDE_DIRS})
server/CMakeLists.txt
55 55
IF (catkin_FOUND)
56 56
    SET(ROS_FOUND 1)
57 57

  
58
    find_package(catkin REQUIRED COMPONENTS roscpp std_msgs geometry_msgs sensor_msgs message_generation genmsg actionlib_msgs actionlib tf2_ros tf2_eigen angles)
58
    find_package(catkin REQUIRED COMPONENTS roscpp std_msgs geometry_msgs sensor_msgs message_generation genmsg actionlib_msgs actionlib tf2_ros tf2_eigen angles humotion)
59 59
    find_package(PkgConfig REQUIRED)
60 60
    pkg_search_module(EIGEN3 REQUIRED eigen3)
61 61

  
......
95 95
    )
96 96

  
97 97
    catkin_package(
98
        INCLUDE_DIRS include
98
        # INCLUDE_DIRS include
99 99
        LIBRARIES
100 100
        CATKIN_DEPENDS actionlib_msgs
101 101
        #CATKIN_DEPENDS message_runtime

Also available in: Unified diff