From a7173dbd3c46eb0602c67c7a3b919801d6e2f23c Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sun, 23 Jun 2024 20:24:45 -0700 Subject: [PATCH] [apriltag] Fix GCC 14 calloc() warning (#6773) --- apriltag/CMakeLists.txt | 2 +- shared/apriltaglib.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt index d098bb01aa..e6b9aa6f97 100644 --- a/apriltag/CMakeLists.txt +++ b/apriltag/CMakeLists.txt @@ -7,7 +7,7 @@ include(FetchContent) fetchcontent_declare( apriltaglib GIT_REPOSITORY https://github.com/wpilibsuite/apriltag.git - GIT_TAG 64be6ab26abf5e995321997fd0752c609a7e30f4 + GIT_TAG da208cc38c1b78fe89861616d44c0692e76b6b8b ) # Don't use apriltag's CMakeLists.txt due to conflicting naming and JNI diff --git a/shared/apriltaglib.gradle b/shared/apriltaglib.gradle index b91a70f825..d0ebc6104b 100644 --- a/shared/apriltaglib.gradle +++ b/shared/apriltaglib.gradle @@ -6,7 +6,7 @@ nativeUtils { headerClassifier = "headers" sourceClassifier = "sources" ext = "zip" - version = '3.3.0-1' + version = '3.3.0-2' targetPlatforms.addAll(nativeUtils.wpi.platforms.allPlatforms) } }