mirrors/ugv_sdk
1
0
Fork 0
mirror of https://github.com/westonrobot/ugv_sdk synced 2023-04-08 06:32:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix position of catkin_package()

Browse Source 
According to http://wiki.ros.org/catkin/CMakeLists.txt#Example, should be located before add_library/add_executable.
This commit is contained in:
ihrabar
2021-11-11 16:42:21 +01:00
committed by Juraj Oršulić
parent 6b6a001e37
commit 3cc051116b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@@ -18,6 +18,12 @@ if(CATKIN_DEVEL_PREFIX)
message(STATUS "Build package with catkin") message(STATUS "Build package with catkin")
set(BUILD_WITHOUT_ROS OFF) set(BUILD_WITHOUT_ROS OFF)
find_package(catkin REQUIRED) find_package(catkin REQUIRED)
catkin_package(
LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include
# CATKIN_DEPENDS async_port
# DEPENDS system_lib
)
else() else()
message(STATUS "Build package with cmake") message(STATUS "Build package with cmake")
set(BUILD_WITHOUT_ROS ON) set(BUILD_WITHOUT_ROS ON)
@@ -187,13 +193,6 @@ if(BUILD_WITHOUT_ROS) # BUILD_WITHOUT_ROS
else() # BUILD_WITHOUT_ROS else() # BUILD_WITHOUT_ROS
catkin_package(
LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include
# CATKIN_DEPENDS async_port
# DEPENDS system_lib
)
## Add catkin install targets ## Add catkin install targets
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}