From c2971c0bb36b58618803a6b32e3eb1b395b226af Mon Sep 17 00:00:00 2001
From: Gold856 <117957790+Gold856@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:31:27 -0500
Subject: [PATCH] [build] cmake: Export apriltag and wpimath (#6012)

---
 CMakeLists.txt         | 12 ++++++------
 wpilib-config.cmake.in | 11 +++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0af74c68f..249b542681 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -213,16 +213,16 @@ find_package(LIBSSH 0.7.1)
 find_package(Protobuf REQUIRED)
 find_program(Quickbuf_EXECUTABLE NAMES protoc-gen-quickbuf DOC "The Quickbuf protoc plugin")
 
-set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)")
-set(WPINET_DEP_REPLACE "find_dependency(wpinet)")
-set(NTCORE_DEP_REPLACE "find_dependency(ntcore)")
-set(CSCORE_DEP_REPLACE_IMPL "find_dependency(cscore)")
+set(APRILTAG_DEP_REPLACE "find_dependency(apriltag)")
 set(CAMERASERVER_DEP_REPLACE_IMPL "find_dependency(cameraserver)")
+set(CSCORE_DEP_REPLACE_IMPL "find_dependency(cscore)")
 set(HAL_DEP_REPLACE_IMPL "find_dependency(hal)")
-set(WPIMATH_DEP_REPLACE "find_dependency(wpimath)")
-set(WPIUNITS_DEP_REPLACE "find_dependency(wpiunits)")
+set(NTCORE_DEP_REPLACE "find_dependency(ntcore)")
 set(WPILIBC_DEP_REPLACE_IMPL "find_dependency(wpilibc)")
 set(WPILIBNEWCOMMANDS_DEP_REPLACE "find_dependency(wpilibNewCommands)")
+set(WPIMATH_DEP_REPLACE "find_dependency(wpimath)")
+set(WPINET_DEP_REPLACE "find_dependency(wpinet)")
+set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)")
 
 set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)")
 set(SELF_DIR "$\{SELF_DIR\}")
diff --git a/wpilib-config.cmake.in b/wpilib-config.cmake.in
index aaf4bb84f8..018c39ce93 100644
--- a/wpilib-config.cmake.in
+++ b/wpilib-config.cmake.in
@@ -4,11 +4,14 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_dependency(Threads)
 @LIBUV_SYSTEM_REPLACE@
 @EIGEN_SYSTEM_REPLACE@
-@WPIUTIL_DEP_REPLACE@
-@WPINET_DEP_REPLACE@
-@NTCORE_DEP_REPLACE@
-@CSCORE_DEP_REPLACE@
+
+@APRILTAG_DEP_REPLACE@
 @CAMERASERVER_DEP_REPLACE@
+@CSCORE_DEP_REPLACE@
 @HAL_DEP_REPLACE@
+@NTCORE_DEP_REPLACE@
 @WPILIBC_DEP_REPLACE@
 @WPILIBNEWCOMMANDS_DEP_REPLACE@
+@WPIMATH_DEP_REPLACE@
+@WPINET_DEP_REPLACE@
+@WPIUTIL_DEP_REPLACE@