[apriltag] update to 3.4.0 (#37353)

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
This commit is contained in:
Vitalii Koshura 2024-03-12 17:40:53 +01:00 committed by GitHub
parent e105a86c97
commit 217e27785b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 55 deletions

View File

@ -1,50 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9924a74..08e3cbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
project(apriltag VERSION 3.3.0 LANGUAGES C CXX)
if(POLICY CMP0077)
@@ -39,6 +39,9 @@ endif()
aux_source_directory(common COMMON_SRC)
set(APRILTAG_SRCS apriltag.c apriltag_pose.c apriltag_quad_thresh.c)
+if (MSVC)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
# Library
file(GLOB TAG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tag*.c)
add_library(${PROJECT_NAME} ${APRILTAG_SRCS} ${COMMON_SRC} ${TAG_FILES})
@@ -98,6 +101,7 @@ write_basic_package_version_file("${version_config}" COMPATIBILITY SameMajorVers
install(TARGETS ${PROJECT_NAME} EXPORT ${targets_export_name}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
install(EXPORT ${targets_export_name}
@@ -120,7 +124,7 @@ install(FILES "${PROJECT_BINARY_DIR}/apriltag.pc" DESTINATION "${CMAKE_INSTALL_L
# Python wrapper
include(CMakeDependentOption)
-cmake_dependent_option(BUILD_PYTHON_WRAPPER "Builds Python wrapper" ON BUILD_SHARED_LIBS OFF)
+option(BUILD_PYTHON_WRAPPER "Builds Python wrapper" OFF)
if(BUILD_PYTHON_WRAPPER)
SET(Python_ADDITIONAL_VERSIONS 3)
@@ -158,6 +162,7 @@ string(STRIP ${PY_DEST} PY_DEST)
install(FILES ${PROJECT_BINARY_DIR}/apriltag${PY_EXT_SUFFIX} DESTINATION ${PY_DEST})
endif (NOT Python3_NOT_FOUND AND NOT Numpy_NOT_FOUND AND PYTHONLIBS_FOUND AND BUILD_PYTHON_WRAPPER)
+if(0)
# Examples
# apriltag_demo
add_executable(apriltag_demo example/apriltag_demo.c)
@@ -177,3 +182,4 @@ endif(OpenCV_FOUND)
# install example programs
install(TARGETS apriltag_demo RUNTIME DESTINATION bin)
+endif()

View File

@ -6,14 +6,16 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO AprilRobotics/apriltag
REF v${VERSION}
SHA512 45965f2f888475ea5aecdada0d41a5495f6f0c545d5219c96d82aea009e310a17308df858d4ba40ff191cfe15801dfe16298f20efcc5c117695dd0fa8d3a3fd7
SHA512 c6efa98b8c85702441b421955a8fd78cb99ff07e014da5593b95246a0aaf391e9959d336d8005ba193fb6dad0fb5858852918087a401e180af9c46df38a900aa
HEAD_REF master
PATCHES
fix-config.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_PYTHON_WRAPPER=OFF
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTING=OFF
)
vcpkg_cmake_install()

View File

@ -1,6 +1,6 @@
{
"name": "apriltag",
"version": "3.3.0",
"version": "3.4.0",
"description": "AprilTag is a visual fiducial system popular for robotics research.",
"homepage": "https://april.eecs.umich.edu/software/apriltag",
"license": "BSD-2-Clause",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c7ae501c5566bbc76d1262910eafcbb1f56b8e5b",
"version": "3.4.0",
"port-version": 0
},
{
"git-tree": "5c64c401307d5ae0c4ee91fc2e9e1b3950776feb",
"version": "3.3.0",

View File

@ -173,7 +173,7 @@
"port-version": 0
},
"apriltag": {
"baseline": "3.3.0",
"baseline": "3.4.0",
"port-version": 0
},
"apsi": {