updated cmakelists for ros build, added ci config to test both catkin_make and catkin_make_isolated

This commit is contained in:
Ruixiang Du
2020-09-07 14:14:58 +08:00
parent 5ec8b633c1
commit 37d1f2c963
2 changed files with 16 additions and 3 deletions

View File

@@ -17,6 +17,7 @@ option(STATIC_CHECK OFF)
if(CATKIN_DEVEL_PREFIX)
message(STATUS "Build package with catkin")
set(BUILD_WITHOUT_ROS OFF)
find_package(catkin REQUIRED)
else()
message(STATUS "Build package with cmake")
set(BUILD_WITHOUT_ROS ON)
@@ -190,7 +191,8 @@ else() # BUILD_WITHOUT_ROS
catkin_package(
LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include
# DEPENDS rt pthread
# CATKIN_DEPENDS rospy scout_msgs std_msgs
# DEPENDS system_lib
)
## Add catkin install targets