Skip to content

Commit

Permalink
try fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
facontidavide committed Jan 19, 2025
1 parent 25e9f98 commit 141e308
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ros2-humble.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ros2
name: ros2-humble

on: [push, pull_request]

Expand Down
90 changes: 42 additions & 48 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,89 +1,83 @@


##### fastCDR ######

find_package(fastcdr QUIET)
if (NOT fastcdr_FOUND)
CPMAddPackage(
NAME fastcdr
GITHUB_REPOSITORY eProsima/Fast-CDR
GIT_TAG v2.2.6
)
CPMAddPackage("gh:eProsima/[email protected]")
endif()

##### backward_cpp ######

CPMAddPackage("gh:bombela/[email protected]")

##### nlohmann_json ######


CPMAddPackage("gh:nlohmann/[email protected]")

##### MCAP + compression libs ######

find_package(zstd QUIET)
if (NOT zstd_FOUND)
CPMAddPackage(
NAME zstd
GITHUB_REPOSITORY facebook/zstd
GIT_TAG v1.5.6
)
CPMAddPackage("gh:facebook/[email protected]")
endif()

find_package(lz4 QUIET)
if (NOT lz4_FOUND)
CPMAddPackage("gh:lz4/[email protected]")
endif()

find_package(mcap QUIET)
if (NOT mcap_FOUND)

CPMAddPackage(
NAME lz4
GITHUB_REPOSITORY lz4/lz4
GIT_TAG v1.10.0
NAME mcap
GITHUB_REPOSITORY foxglove/mcap
GIT_TAG releases/cpp/v2.0.0
DOWNLOAD_ONLY YES
)
# mcap has no CMake support, so we create our own target
if (mcap_ADDED)
add_library(mcap INTERFACE)
target_include_directories(mcap INTERFACE "${mcap_SOURCE_DIR}/cpp/mcap/include")
endif()
endif()

CPMAddPackage(
NAME mcap
GITHUB_REPOSITORY foxglove/mcap
GIT_TAG releases/cpp/v2.0.0
DOWNLOAD_ONLY YES
)
# mcap has no CMake support, so we create our own target
if (mcap_ADDED)
add_library(mcap INTERFACE)
target_include_directories(mcap INTERFACE "${mcap_SOURCE_DIR}/cpp/mcap/include")
endif()
##### Lua + Sol2 ######

find_package(lua 5.4 QUIET)
if (NOT lua_FOUND)
CPMAddPackage(
NAME lua
GIT_REPOSITORY https://github.com/lua/lua.git
VERSION 5.4.4
VERSION 5.4.7
DOWNLOAD_ONLY YES
)
# lua has no CMake support, so we create our own target
if (lua_ADDED)
FILE(GLOB lua_sources ${lua_SOURCE_DIR}/*.c)
list(REMOVE_ITEM lua_sources "${lua_SOURCE_DIR}/lua.c" "${lua_SOURCE_DIR}/luac.c")
add_library(lua STATIC ${lua_sources})
target_include_directories(lua PUBLIC $<BUILD_INTERFACE:${lua_SOURCE_DIR}>)
set_property(TARGET lua PROPERTY POSITION_INDEPENDENT_CODE ON)
file(GLOB lua_sources ${lua_SOURCE_DIR}/*.c)
list(REMOVE_ITEM lua_sources "${lua_SOURCE_DIR}/lua.c" "${lua_SOURCE_DIR}/luac.c")
add_library(lua STATIC ${lua_sources})
target_include_directories(lua SYSTEM PUBLIC $<BUILD_INTERFACE:${lua_SOURCE_DIR}>)
set_property(TARGET lua PROPERTY POSITION_INDEPENDENT_CODE ON)
endif()
endif()

CPMAddPackage("gh:ThePhD/[email protected]")

CPMAddPackage(
NAME backward_cpp
GITHUB_REPOSITORY bombela/backward-cpp
GIT_TAG v1.6
)

CPMAddPackage(
NAME nlohmann_json
GITHUB_REPOSITORY nlohmann/json
GIT_TAG v3.11.3
)

CPMAddPackage(
NAME sol2
GITHUB_REPOSITORY ThePhD/sol2
GIT_TAG v3.3.0
)
##### data_tamer ######

CPMAddPackage(
NAME data_tamer
GITHUB_REPOSITORY PickNikRobotics/data_tamer
GIT_TAG 0.9.3
DOWNLOAD_ONLY YES
)
)

# we are interested only in data_tamer_parser includes
if (data_tamer_ADDED)
# we are interested only in data_tamer_parser includes
add_library(data_tamer_parser INTERFACE)
target_include_directories(data_tamer_parser INTERFACE "${data_tamer_SOURCE_DIR}/data_tamer_cpp/include")
endif()
Expand Down
1 change: 1 addition & 0 deletions plotjuggler_plugins/DataLoadMCAP/dialog_mcap.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef DIALOG_MCAP_H
#define DIALOG_MCAP_H

#include <memory>
#include <QDialog>
#include <optional>
#include "dataload_params.h"
Expand Down

0 comments on commit 141e308

Please sign in to comment.