Skip to content

Commit 0dae227

Browse files
authored
Merge pull request #1 from kgeorgiev93/hunter-1.11.13
Hunterise actionlib
2 parents 61dee11 + 42f2364 commit 0dae227

File tree

7 files changed

+563
-9
lines changed

7 files changed

+563
-9
lines changed

CMakeLists.txt

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
cmake_minimum_required(VERSION 2.8.3)
2+
3+
include(cmake/HunterGate.cmake)
4+
HunterGate(
5+
URL "https://github.com/ruslo/hunter/archive/v0.23.210.tar.gz"
6+
SHA1 "edd9550bf64ebdffcd7934e6e8a5c094a7b3358b"
7+
)
8+
29
project(actionlib)
310

11+
hunter_add_package(ros_common_msgs)
12+
hunter_add_package(ros_message_generation)
13+
hunter_add_package(ros)
14+
hunter_add_package(ros_comm)
15+
hunter_add_package(ros_std_msgs)
16+
417
find_package(catkin REQUIRED COMPONENTS actionlib_msgs message_generation roscpp rosunit std_msgs)
5-
find_package(Boost REQUIRED COMPONENTS thread)
18+
find_package(Boost CONFIG REQUIRED COMPONENTS thread)
619

720
include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
821
link_directories(${catkin_LIBRARY_DIRS})
@@ -12,28 +25,38 @@ catkin_python_setup()
1225
add_action_files(DIRECTORY action FILES Test.action TestRequest.action TwoInts.action)
1326
generate_messages(DEPENDENCIES actionlib_msgs std_msgs)
1427

28+
set(PROJECT_INSTALLSPACE_LIBRARIES ros::actionlib)
1529
catkin_package(
1630
INCLUDE_DIRS include
1731
LIBRARIES actionlib
1832
CATKIN_DEPENDS actionlib_msgs message_runtime roscpp std_msgs
19-
DEPENDS Boost
33+
DEPENDS "Boost COMPONENTS thread"
2034
)
2135

2236
add_library(actionlib src/connection_monitor.cpp src/goal_id_generator.cpp)
23-
target_link_libraries(actionlib ${catkin_LIBRARIES} ${Boost_LIBRARIES})
37+
target_link_libraries(actionlib ${catkin_LIBRARIES} Boost::thread)
2438
add_dependencies(actionlib actionlib_gencpp)
39+
target_include_directories(actionlib PUBLIC
40+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
41+
$<INSTALL_INTERFACE:include>
42+
)
2543

2644
catkin_install_python(PROGRAMS tools/axclient.py tools/axserver.py tools/dynamic_action.py tools/library.py
2745
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
2846
install(TARGETS ${PROJECT_NAME}
47+
EXPORT ${PROJECT_NAME}Targets
2948
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
3049
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
3150
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION})
51+
install(EXPORT ${PROJECT_NAME}Targets
52+
DESTINATION share/${PROJECT_NAME}/cmake
53+
NAMESPACE ros::
54+
FILE ${PROJECT_NAME}Targets.cmake)
3255
install(DIRECTORY include/${PROJECT_NAME}/
3356
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
3457
FILES_MATCHING PATTERN "*.h")
3558

3659
if(CATKIN_ENABLE_TESTING)
37-
find_package(rostest)
60+
find_package(rostest CONFIG REQUIRED)
3861
add_subdirectory(test)
3962
endif()

0 commit comments

Comments
 (0)