Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ubuntu 22.04, ros humble fixes #41

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ if [ "$(uname)" == "Darwin" ]; then
export CXX="$(brew --prefix)/opt/llvm/bin/clang++"
else
if $gcc; then
export CC="gcc-8"
export CXX="g++-8"
export CC="gcc-11"
export CXX="g++-11"
else
export CC="clang-8"
export CXX="clang++-8"
export CC="clang-11"
export CXX="clang++-11"
fi
fi

Expand Down Expand Up @@ -117,7 +117,7 @@ pushd $build_dir >/dev/null
# final linking of the binaries can fail due to a missing libc++abi library
# (happens on Fedora, see https://bugzilla.redhat.com/show_bug.cgi?id=1332306).
# So we only build the libraries here for now
make -j"$(nproc)"
make -lc++fs -j"$(nproc)"
popd >/dev/null

mkdir -p AirLib/lib/x64/$folder_name
Expand Down
2 changes: 1 addition & 1 deletion cmake/cmake-modules/CommonSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ macro(CommonSetup)
if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
set(CMAKE_CXX_FLAGS "-stdlib=libc++ -Wno-documentation -Wno-unknown-warning-option ${CMAKE_CXX_FLAGS}")
find_package(LLVM REQUIRED CONFIG)
set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -lc++fs -ferror-limit=10")
set(CXX_EXP_LIB "-L${LLVM_LIBRARY_DIRS} -ferror-limit=10")
else()
set(CXX_EXP_LIB "-lstdc++fs -fmax-errors=10 -Wnoexcept -Wstrict-null-sentinel")
endif ()
Expand Down
12 changes: 12 additions & 0 deletions ros2/src/airsim_ros_pkgs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ ament_target_dependencies(pd_position_controller_simple
nav_msgs
geometry_msgs
airsim_interfaces
tf2
tf2_ros
tf2_geometry_msgs
)

add_library(airsim_ros src/airsim_ros_wrapper.cpp)
Expand All @@ -72,6 +75,11 @@ ament_target_dependencies(airsim_ros
tf2_ros
cv_bridge
airsim_interfaces
mavros_msgs
std_srvs
tf2_geometry_msgs
tf2_sensor_msgs
tf2
)

add_executable(airsim_node src/airsim_node.cpp)
Expand All @@ -86,6 +94,10 @@ target_link_libraries(pd_position_controller_simple_node
pd_position_controller_simple airsim_ros AirLib)
ament_target_dependencies(pd_position_controller_simple_node
rclcpp
mavros_msgs
tf2
tf2_ros
tf2_geometry_msgs
)

# rosidl_target_interfaces(airsim_node
Expand Down
4 changes: 4 additions & 0 deletions ros2/src/airsim_ros_pkgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@

<member_of_group>rosidl_interface_packages</member_of_group>

<depend>tf2</depend>
<depend>tf2_ros</depend>
<depend>tf2_geometry_msgs</depend>

<build_depend>geometry_msgs</build_depend>
<build_depend>image_transport</build_depend>
<build_depend>message_runtime</build_depend>
Expand Down
4 changes: 2 additions & 2 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ else #linux
software-properties-common \
wget \
libvulkan1 \
vulkan-utils
vulkan-tools

#install clang and build tools
VERSION=$(lsb_release -rs | cut -d. -f1)
Expand All @@ -60,7 +60,7 @@ else #linux
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-get update
fi
sudo apt-get install -y clang-8 clang++-8 libc++-8-dev libc++abi-8-dev
sudo apt-get install -y clang-11 clang++-11 libc++-11-dev libc++abi-11-dev
fi

if ! which cmake; then
Expand Down
Loading