Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[apriltag] Use wpilibsuite fork of apriltag (#4764)

Browse Source
This commit is contained in:
Peter Johnson
2022-12-05 19:59:24 -08:00
committed by GitHub
parent eab0d929e6
commit 72e21a1ed1
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apriltag/CMakeLists.txt
View File

@@ -6,8 +6,8 @@ include(FetchContent)
FetchContent_Declare(
apriltaglib
GIT_REPOSITORY https://github.com/photonvision/apriltag.git
GIT_TAG 404435205b62c3981569dc837e0051d829181ab3
GIT_REPOSITORY https://github.com/wpilibsuite/apriltag.git
GIT_TAG ad31e33d20f9782b7239cb15cde57c56c91383ad
)
# Don't use apriltag's CMakeLists.txt due to conflicting naming and JNI
@@ -82,12 +82,9 @@ target_compile_features(apriltag PUBLIC cxx_std_20)
wpilib_target_warnings(apriltag)
# disable warnings that apriltaglib can't handle
if (MSVC)
target_compile_options(apriltag PRIVATE /wd4005 /wd4018 /wd4098 /wd4200 /wd4244 /wd4996)
target_compile_options(apriltag PRIVATE /wd4018)
else()
target_compile_options(apriltag PRIVATE -Wno-newline-eof -Wno-unused-variable -Wno-sign-compare -Wno-pedantic -Wno-shift-negative-value)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
target_compile_options(apriltag PRIVATE -Wno-maybe-uninitialized)
endif()
target_compile_options(apriltag PRIVATE -Wno-sign-compare -Wno-gnu-zero-variadic-macro-arguments)
endif()
target_link_libraries(apriltag wpimath)

2
shared/apriltaglib.gradle
View File

@@ -6,7 +6,7 @@ nativeUtils {
headerClassifier = "headers"
sourceClassifier = "sources"
ext = "zip"
version = '3.2.0-1'
version = '3.2.0-2'
targetPlatforms.addAll(nativeUtils.wpi.platforms.allPlatforms)
}
}