From bd0037f3c93ba5a080ec37c94bbb249dbca79b3e Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Thu, 8 Apr 2021 13:34:21 +0300 Subject: [PATCH] Try to fix pthreads ld error --- builder/image-ros.sh | 3 +++ clover/CMakeLists.txt | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/builder/image-ros.sh b/builder/image-ros.sh index e56bc43c..17cf3be9 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -133,6 +133,9 @@ my_travis_retry apt-get install -y --no-install-recommends \ ros-${ROS_DISTRO}-ws281x \ ros-${ROS_DISTRO}-rosshow +echo_stamp "Installing libboost-dev" # https://travis-ci.org/github/CopterExpress/clover/jobs/766318908#L6536 +my_travis_retry apt-get install -y --no-install-recommends libboost-dev + # TODO move GeographicLib datasets to Mavros debian package echo_stamp "Install GeographicLib datasets (needed for mavros)" \ && wget -qO- https://raw.githubusercontent.com/mavlink/mavros/master/mavros/scripts/install_geographiclib_datasets.sh | bash diff --git a/clover/CMakeLists.txt b/clover/CMakeLists.txt index 9b717d68..5cde1ffb 100644 --- a/clover/CMakeLists.txt +++ b/clover/CMakeLists.txt @@ -44,10 +44,6 @@ find_package(OpenCV ${_opencv_version} REQUIRED imgproc ) -# Fix https://travis-ci.org/github/CopterExpress/clover/jobs/766318908#L6536 -set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(Threads REQUIRED) - ## System dependencies are found with CMake's conventions # find_package(Boost REQUIRED COMPONENTS system)