Skip to content

Commit 6e97ab1

Browse files
committed
Free from catkin simple.
1 parent 123c9d1 commit 6e97ab1

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

rviz_polygon_tool/CMakeLists.txt

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@ project(rviz_polygon_tool)
44
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
55
set(CMAKE_CXX_STANDARD 17)
66

7-
find_package(catkin_simple REQUIRED)
8-
catkin_simple(ALL_DEPS_REQUIRED)
7+
find_package(catkin REQUIRED COMPONENTS
8+
roscpp
9+
rviz
10+
polygon_coverage_msgs
11+
polygon_coverage_geometry
12+
geometry_msgs)
13+
catkin_package(
14+
INCLUDE_DIRS include ${catkin_INCLUDE_DIRS}
15+
LIBRARIES ${PROJECT_NAME}
16+
)
17+
include_directories(include ${catkin_INCLUDE_DIRS})
918

1019
######
1120
# QT #
@@ -34,8 +43,11 @@ set(HEADER_FILES
3443
set(SRC_FILES
3544
src/polygon_tool.cc
3645
)
37-
cs_add_library(${PROJECT_NAME} ${SRC_FILES} ${HEADER_FILES})
38-
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
46+
add_library(${PROJECT_NAME} ${SRC_FILES} ${HEADER_FILES})
47+
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${catkin_LIBRARIES})
3948

40-
cs_install()
41-
cs_export()
49+
install(TARGETS ${PROJECT_NAME}
50+
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
51+
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
52+
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
53+
)

rviz_polygon_tool/package.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<license>GPL</license>
1414

1515
<buildtool_depend>catkin</buildtool_depend>
16-
<buildtool_depend>catkin_simple</buildtool_depend>
1716

1817
<depend>roscpp</depend>
1918
<depend>rviz</depend>

0 commit comments

Comments
 (0)