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.

Sign up for GitHub

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

Jump to bottom

Fix ROS1 melodic build #78

Merged
merged 1 commit into from
Feb 23, 2023
Merged

Fix ROS1 melodic build #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,23 @@ pip_package:
- VERBOSE=1 pip install --verbose ./python/
- kiss_icp_pipeline --version

ros1_melodic:
image: osrf/ros:melodic-desktop-full
stage: build
before_script:
- apt-get update && sudo apt-get install -y gpg wget
- wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
- echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null && apt update
- rm /usr/share/keyrings/kitware-archive-keyring.gpg
- apt-get install -y kitware-archive-keyring
- apt-get install -y cmake
script:
- rm -rf ~/catkin_ws/
- mkdir -p ~/catkin_ws/
- cp -r ${CI_PROJECT_DIR} ~/catkin_ws/src
- cd ~/catkin_ws/
- catkin_make

ros1_noetic:
image: osrf/ros:noetic-desktop-full
stage: build
Expand Down
4 changes: 2 additions & 2 deletions cpp/kiss_icp/3rdparty/tbb/tbb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# SOFTWARE.
# TODO(Nacho): Use mainstream repo from OneAPI instead of my own fork
include(ExternalProject)

find_package(Threads)
ExternalProject_Add(
external_tbb
PREFIX tbb
Expand All @@ -45,5 +45,5 @@ add_library(TBBHelper INTERFACE)
add_dependencies(TBBHelper external_tbb)
target_include_directories(TBBHelper INTERFACE ${INSTALL_DIR}/include)
target_link_directories(TBBHelper INTERFACE ${INSTALL_DIR}/lib)
target_link_libraries(TBBHelper INTERFACE tbb)
target_link_libraries(TBBHelper INTERFACE tbb Threads::Threads)
add_library(TBB::tbb ALIAS TBBHelper)