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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

@@ -30,7 +30,7 @@ cpp-test:
# - cpp-build # - cpp-build
## Build and test as catkin package ## Build and test as catkin package
catkin-build: melodic-catkin-build:
stage: build stage: build
image: rduweston/ubuntu-ci:melodic-bionic image: rduweston/ubuntu-ci:melodic-bionic
before_script: before_script:
@@ -38,4 +38,15 @@ catkin-build:
script: script:
- mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace" - mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
- cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk - cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk
- cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make" - cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make"
## Build and test as catkin package
melodic-catkin-isolated-build:
stage: build
image: rduweston/ubuntu-ci:melodic-bionic
before_script:
- apt update && apt -y install libasio-dev
script:
- mkdir -p /catkin_ws/src && cd /catkin_ws/src && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_init_workspace"
- cp -r /builds/$CI_PROJECT_PATH /catkin_ws/src/wrp_sdk
- cd /catkin_ws && /bin/bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash; catkin_make_isolated --install"

4
CMakeLists.txt
View File

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