diff --git a/aruco_pose/CMakeLists.txt b/aruco_pose/CMakeLists.txt index 7d15cf39..e3ab2a93 100644 --- a/aruco_pose/CMakeLists.txt +++ b/aruco_pose/CMakeLists.txt @@ -159,9 +159,6 @@ add_library(aruco_pose add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg) -# FIXME: hack to fix https://travis-ci.org/github/CopterExpress/clover/jobs/766318908#L6532 -# string(REPLACE "-lpthreads;" "" catkin_LIBRARIES "${catkin_LIBRARIES}") - ## Declare a C++ executable ## With catkin_make all packages are built within a single CMake context ## The recommended prefix ensures that target names across packages don't collide diff --git a/builder/image-ros.sh b/builder/image-ros.sh index 7647f518..e97bce00 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -103,8 +103,6 @@ ros-${ROS_DISTRO}-web-video-server 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 libboost-all-dev -# cp /lib/arm-linux-gnueabihf/libpthread.so.0 /lib/arm-linux-gnueabihf/libpthreads.so - echo_stamp "Build and install Clover" cd /home/pi/catkin_ws # Don't try to install gazebo_ros diff --git a/clover/CMakeLists.txt b/clover/CMakeLists.txt index fc96fa95..2e96289e 100644 --- a/clover/CMakeLists.txt +++ b/clover/CMakeLists.txt @@ -185,9 +185,6 @@ add_executable(clover_led src/led.cpp) add_executable(shell src/shell.cpp) -# FIXME: hack to fix https://travis-ci.org/github/CopterExpress/clover/jobs/766318908#L6532 -# string(REPLACE "-lpthreads;" "" catkin_LIBRARIES "${catkin_LIBRARIES}") - target_link_libraries(simple_offboard ${catkin_LIBRARIES} ${GeographicLib_LIBRARIES}