diff --git a/.github/ci.sh b/.github/ci.sh index a090c84..60b2029 100755 --- a/.github/ci.sh +++ b/.github/ci.sh @@ -114,6 +114,23 @@ function build_catkin_debug rospack find fixposition_driver_ros1 } +TITLES["build_catkin_release_mindeps"]="Build catkin (release, with ROS1, minimal deps)" +function build_catkin_release_mindeps +{ + local buildname=${FPSDK_IMAGE}_build_catkin_release_mindeps + ${FP_SRC_DIR}/create_ros_ws.sh ${buildname} + cd ${FP_SRC_DIR}/${buildname} + catkin config --cmake-args \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCMAKE_BUILD_TYPE=Release -DFPSDK_BUILD_TESTING=OFF \ + -DFPSDK_USE_BZ2=OFF -DFPSDK_USE_PROJ=OFF -DFPSDK_USE_FFMPEG=OFF || return 1 + catkin build || return 1 + set +u + source devel/setup.bash + set -u + rospack find fixposition_driver_ros1 +} + ######################################################################################################################## TITLES["build_colcon_release"]="Build colcon (release, with ROS2)" @@ -142,6 +159,22 @@ function build_colcon_debug ros2 pkg executables fixposition_driver_ros2 } +TITLES["build_colcon_release_mindeps"]="Build colcon (release, with ROS2, minimal deps)" +function build_colcon_release_mindeps +{ + local buildname=${FPSDK_IMAGE}_build_colcon_release_mindeps + ${FP_SRC_DIR}/create_ros_ws.sh ${buildname} || return 1 + cd ${FP_SRC_DIR}/${buildname} + yq -i '.build.cmake-args += "-DFPSDK_USE_BZ2=OFF"' colcon_defaults.yaml + yq -i '.build.cmake-args += "-DFPSDK_USE_PROJ=OFF"' colcon_defaults.yaml + yq -i '.build.cmake-args += "-DFPSDK_USE_FFMPEG=OFF"' colcon_defaults.yaml + colcon build || return 1 + set +u + source install/setup.bash + set -u + ros2 pkg executables fixposition_driver_ros2 +} + # ---------------------------------------------------------------------------------------------------------------------- TITLES["build_colcon_release_clang"]="Build colcon (release, with ROS2, clang instead of GCC)" @@ -188,6 +221,8 @@ if [ "${ROS_DISTRO}" = "noetic" ]; then do_step build_catkin_release || true # continue do_step build_catkin_debug || true # continue + do_step build_catkin_release_mindeps || true # continue + # ROS 2 elif [ "${ROS_DISTRO}" = "humble" -o "${ROS_DISTRO}" = "jazzy" -o "${ROS_DISTRO}" = "lyrical" ]; then set +u @@ -197,6 +232,8 @@ elif [ "${ROS_DISTRO}" = "humble" -o "${ROS_DISTRO}" = "jazzy" -o "${ROS_DISTRO} do_step build_colcon_release || true # continue do_step build_colcon_debug || true # continue + do_step build_colcon_release_mindeps || true # continue + do_step build_colcon_release_clang || true # continue do_step build_colcon_debug_clang || true # continue fi diff --git a/fixposition-sdk b/fixposition-sdk index bd16faa..ecb0b9c 160000 --- a/fixposition-sdk +++ b/fixposition-sdk @@ -1 +1 @@ -Subproject commit bd16faa4198cabca87b9087fc8630ee9521aaa5e +Subproject commit ecb0b9cefa80722a98da3634a635fc5a55e6f423 diff --git a/fixposition_driver_lib/CMakeLists.txt b/fixposition_driver_lib/CMakeLists.txt index 8f4c7a9..c52ac2d 100644 --- a/fixposition_driver_lib/CMakeLists.txt +++ b/fixposition_driver_lib/CMakeLists.txt @@ -17,6 +17,9 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") endif() set(_unused "${FPSDK_BUILD_TESTING}") # suppress warning +set(_unused "${FPSDK_USE_PROJ}") # suppress warning +set(_unused "${FPSDK_USE_FFMPEG}") # suppress warning +set(_unused "${FPSDK_USE_BZ2}") # suppress warning set(_unused "${CMAKE_C_COMPILER}") # suppress warning # DEPENDENCIES ========================================================================================================= diff --git a/fixposition_driver_msgs/CMakeLists.txt b/fixposition_driver_msgs/CMakeLists.txt index 1d4cfa7..d00271c 100644 --- a/fixposition_driver_msgs/CMakeLists.txt +++ b/fixposition_driver_msgs/CMakeLists.txt @@ -17,6 +17,10 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") endif() set(_unused "${FPSDK_BUILD_TESTING}") # suppress warning +set(_unused "${FPSDK_USE_PROJ}") # suppress warning +set(_unused "${FPSDK_USE_FFMPEG}") # suppress warning +set(_unused "${FPSDK_USE_BZ2}") # suppress warning +set(_unused "${CMAKE_C_COMPILER}") # suppress warning # DEPENDENCIES ========================================================================================================= diff --git a/fixposition_driver_ros1/CMakeLists.txt b/fixposition_driver_ros1/CMakeLists.txt index 977a133..b98233e 100644 --- a/fixposition_driver_ros1/CMakeLists.txt +++ b/fixposition_driver_ros1/CMakeLists.txt @@ -16,6 +16,10 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") endif() set(_unused "${FPSDK_BUILD_TESTING}") # suppress warning +set(_unused "${FPSDK_USE_PROJ}") # suppress warning +set(_unused "${FPSDK_USE_FFMPEG}") # suppress warning +set(_unused "${FPSDK_USE_BZ2}") # suppress warning +set(_unused "${CMAKE_C_COMPILER}") # suppress warning # DEPENDENCIES ========================================================================================================= diff --git a/fixposition_driver_ros2/CMakeLists.txt b/fixposition_driver_ros2/CMakeLists.txt index b16d81f..fa9dccc 100644 --- a/fixposition_driver_ros2/CMakeLists.txt +++ b/fixposition_driver_ros2/CMakeLists.txt @@ -9,6 +9,10 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(_unused "${FPSDK_BUILD_TESTING}") # suppress warning +set(_unused "${FPSDK_USE_PROJ}") # suppress warning +set(_unused "${FPSDK_USE_FFMPEG}") # suppress warning +set(_unused "${FPSDK_USE_BZ2}") # suppress warning +set(_unused "${CMAKE_C_COMPILER}") # suppress warning # DEPENDENCIES ========================================================================================================= find_package(Boost 1.65.0 REQUIRED COMPONENTS date_time) diff --git a/rtcm_msgs/CMakeLists.txt b/rtcm_msgs/CMakeLists.txt index 66b80ae..a4ae2dd 100644 --- a/rtcm_msgs/CMakeLists.txt +++ b/rtcm_msgs/CMakeLists.txt @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.16) project(rtcm_msgs) set(_unused "${FPSDK_BUILD_TESTING}") # suppress warning +set(_unused "${FPSDK_USE_PROJ}") # suppress warning +set(_unused "${FPSDK_USE_FFMPEG}") # suppress warning +set(_unused "${FPSDK_USE_BZ2}") # suppress warning +set(_unused "${CMAKE_C_COMPILER}") # suppress warning # ros_environment is needed to have ROS_VERSION find_package(ros_environment REQUIRED)