Skip to content

Commit

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

on: [push, pull_request]

Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if (NOT lua_FOUND)
# 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")
list(REMOVE_ITEM lua_sources "${lua_SOURCE_DIR}/lua.c" "${lua_SOURCE_DIR}/luac.c" "${lua_SOURCE_DIR}/onelua.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)
Expand Down
15 changes: 8 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ IF (NOT WIN32 AND ENABLE_ASAN)
set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fno-omit-frame-pointer -fsanitize=address")
endif()


include_directories( plotjuggler_base/include )
include_directories( plotjuggler_base/src )

Expand Down Expand Up @@ -66,10 +67,6 @@ set(CMAKE_AUTOMOC ON)
SET(CMAKE_AUTOUIC ON)


if (NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer")
endif()

if(APPLE AND EXISTS /usr/local/opt/qt5)
# Homebrew installs Qt5 (up to at least 5.9.1) in
# /usr/local/qt5, ensure it can be found by CMake since
Expand Down Expand Up @@ -110,12 +107,16 @@ if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
endif()

IF (NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
else()
IF (WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_USE_MATH_DEFINES")
set(CMAKE_WIN32_EXECUTABLE ON)
set(GUI_TYPE WIN32)
if(MSVC)
add_compile_options(/wd4267)
endif()
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fno-omit-frame-pointer")
add_compile_options(-Wno-deprecated-declarations)
ENDIF()

include_directories(
Expand Down
8 changes: 7 additions & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,23 @@
<depend>rclcpp</depend>
<depend>fastcdr</depend>

<!-- common dependancies -->
<!-- Qt dependancies -->
<depend>qtbase5-dev</depend>
<depend>libqt5-svg-dev</depend>
<depend>libqt5-websockets-dev</depend>
<depend>libqt5-opengl-dev</depend>
<depend>libqt5x11extras5-dev</depend>

<!-- needed for backward_cpp -->
<depend>binutils</depend>

<depend>boost</depend>
<depend>libzmq3-dev</depend>

<!-- needed for MCAP -->
<depend>lz4</depend>
<depend>libzstd-dev</depend>

<depend>protobuf-dev</depend>

<!-- The export tag contains other, unspecified, tags -->
Expand Down

0 comments on commit 62931ca

Please sign in to comment.