Skip to content

Commit

Permalink
[apriltag] New port added (microsoft#36336)
Browse files Browse the repository at this point in the history
Signed-off-by: Vitalii Koshura <[email protected]>
  • Loading branch information
AenBleidd authored Jan 25, 2024
1 parent fd675b7 commit 0bc50c0
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 0 deletions.
62 changes: 62 additions & 0 deletions ports/apriltag/fix-config.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72c3ad6..607d024 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.2.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 ${PROJECT_SOURCE_DIR}/tag*.c)
add_library(${PROJECT_NAME} ${APRILTAG_SRCS} ${COMMON_SRC} ${TAG_FILES})
@@ -46,8 +49,8 @@ add_library(${PROJECT_NAME} ${APRILTAG_SRCS} ${COMMON_SRC} ${TAG_FILES})
if (MSVC)
# FindThreads will not find pthread.h with MSVC
# winmm is necessary for __imp_timeGetTime
- find_library(PTHREAD_LIBRARIES NAMES pthreads)
- target_link_libraries(${PROJECT_NAME} ${PTHREAD_LIBRARIES} winmm)
+ find_package(PThreads4W REQUIRED)
+ target_link_libraries(${PROJECT_NAME} PThreads4W::PThreads4W winmm)
else()
find_package(Threads REQUIRED)
target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads m)
@@ -101,6 +104,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}
@@ -123,7 +127,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)
@@ -160,7 +164,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)
@@ -179,3 +183,4 @@ endif(OpenCV_FOUND)

# install example programs
install(TARGETS apriltag_demo RUNTIME DESTINATION bin)
+endif()
38 changes: 38 additions & 0 deletions ports/apriltag/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO AprilRobotics/apriltag
REF v${VERSION}
SHA512 0b09b530ed03dce0bdc3c4e08b17d98f1303ab1d45870843354bf1a5bdf6c7efc6089e2bdf40a370d17a8191b7ce2c46fefa2dd2d49a959591351e00e186f33e
HEAD_REF master
PATCHES
fix-config.patch
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)

vcpkg_cmake_install()

vcpkg_copy_pdbs()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake)
vcpkg_fixup_pkgconfig()

if (VCPKG_TARGET_IS_WINDOWS)
file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}Config.cmake" FIXED_CONFIG)
file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}Config.cmake" "
include(CMakeFindDependencyMacro)
find_dependency(PThreads4W)
${FIXED_CONFIG}
")
endif()

file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
4 changes: 4 additions & 0 deletions ports/apriltag/usage
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
The package apriltag is compatible with built-in CMake targets:

find_package(apriltag REQUIRED)
target_link_libraries(main PRIVATE apriltag::apriltag)
19 changes: 19 additions & 0 deletions ports/apriltag/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "apriltag",
"version": "3.2.0",
"description": "AprilTag is a visual fiducial system popular for robotics research.",
"homepage": "https://april.eecs.umich.edu/software/apriltag",
"license": "BSD-2-Clause",
"supports": "!uwp",
"dependencies": [
"pthreads",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
9 changes: 9 additions & 0 deletions versions/a-/apriltag.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "3523f2ad6198164afda1782327470188dc3f7221",
"version": "3.2.0",
"port-version": 0
}
]
}
4 changes: 4 additions & 0 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@
"baseline": "1.6.3",
"port-version": 0
},
"apriltag": {
"baseline": "3.2.0",
"port-version": 0
},
"apsi": {
"baseline": "0.11.0",
"port-version": 0
Expand Down

0 comments on commit 0bc50c0

Please sign in to comment.