mirror of
https://github.com/CopterExpress/clover.git
synced 2026-05-26 11:43:25 +00:00
4a23a9274a
* builder: Build against Buster * builder: Use correct repository specifications * builder: Move ld.so.preload to have less errors * builder: Use coex repo to install Monkey * builder: Search for buster ROS packages * aruco_pose: Vendor in aruco library from OpenCV 3.4.6 * builder: Move to ROS Melodic * builder: Update kernel version * aruco_pose, clever: Remove opencv3 ROS dependency * builder: Update rosdep * travis: Disable eclint for vendored aruco library * tests: Don't try to locate opencv in ros * roscore: Use melodic distribution * Revert "aruco_pose: Vendor in aruco library from OpenCV 3.4.6" This reverts commit 9c14a8c002bb3396f9a7d9b2ba39969207f066ba. * aruco_pose: Vendor opencv_contrib/aruco again * builder: Add led packages * builder: Remove unused builder code * travis: Add native tests * builder: Set permissions for standalone-install * builder: Use -y for package installation * builder: Add repo for standalone build * builder: Use correct file types for standalone install * aruco_pose: Accept rgb8 map images * builder: Disable mjpg_streamer test * aruco_pose: Allow rgb8 map images (again) * builder: Re-add mjpgstreamer * builder: Install tornado==4.2.1 for rosbridge_suite * builder: Use more recent base image * builder: Use default kernel * builder: Move ld.so.preload back after tests * builder: Disable catkin tests These tests fail on a remote machine but seem to pass just fine on real hardware. Something must have changed between Kinetic and Melodic, and we must investigate more, but for now we just need a working image. * aruco_pose: Remove unused vendored code * selfcheck: Update systemd-analyze regex * builder: Add opencv repository * rosdep: Update package definitions for Melodic * rosdep: Use proper yaml formatting * travis: Remove unnecessary space * docs: Reference Melodic wherever possible
34 lines
875 B
CMake
Vendored
34 lines
875 B
CMake
Vendored
# There should be a better way to add ArUco libraries,
|
|
# but I have not found it yet.
|
|
# -- sfalexrog, 2019.09.11
|
|
if (NOT OpenCV_LIBRARIES OR NOT OpenCV_INCLUDE_DIRS)
|
|
message(FATAL_ERROR "OpenCV was not found - cannot continue")
|
|
endif()
|
|
|
|
message(STATUS "Adding vendored aruco_pose OpenCV module")
|
|
add_library(_opencv_aruco STATIC
|
|
vendor/aruco/src/aruco.cpp
|
|
vendor/aruco/src/charuco.cpp
|
|
vendor/aruco/src/dictionary.cpp
|
|
vendor/aruco/src/zmaxheap.cpp
|
|
)
|
|
|
|
target_include_directories(_opencv_aruco PRIVATE
|
|
${OpenCV_INCLUDE_DIRS}
|
|
)
|
|
target_link_libraries(_opencv_aruco PRIVATE
|
|
${OpenCV_LIBRARIES}
|
|
)
|
|
target_compile_definitions(_opencv_aruco PRIVATE
|
|
CV_OVERRIDE=override
|
|
)
|
|
target_compile_options(_opencv_aruco PRIVATE
|
|
-fpic -fPIC
|
|
)
|
|
|
|
target_include_directories(_opencv_aruco PUBLIC
|
|
vendor/aruco/include
|
|
)
|
|
|
|
set(OpenCV_LIBRARIES "_opencv_aruco;${OpenCV_LIBRARIES}")
|