From 54e628eab8ac4e80647487e8f3f744704563decf Mon Sep 17 00:00:00 2001
From: Gold856 <117957790+Gold856@users.noreply.github.com>
Date: Wed, 26 Jun 2024 01:41:32 -0400
Subject: [PATCH] Make dependency finding in configs more robust

---
 CMakeLists.txt         | 56 ++++++++++++++++++------------------------
 wpilib-config.cmake.in |  6 ++---
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c71467d6c59..0951652763e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,18 +202,6 @@ if(WITH_JAVA)
     set(CMAKE_JAVA_COMPILE_FLAGS "-encoding" "UTF8" "-Xlint:unchecked")
 endif()
 
-if(USE_SYSTEM_LIBUV)
-    set(LIBUV_SYSTEM_REPLACE
-        "
-find_dependency(libuv CONFIG)
-"
-    )
-endif()
-
-if(USE_SYSTEM_EIGEN)
-    set(EIGEN_SYSTEM_REPLACE "find_package(Eigen3 CONFIG)")
-endif()
-
 find_package(LIBSSH 0.7.1)
 
 set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
@@ -221,22 +209,6 @@ set(protobuf_MODULE_COMPATIBLE ON CACHE BOOL "" FORCE)
 find_package(Protobuf REQUIRED)
 set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
 
-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(NTCORE_DEP_REPLACE "find_dependency(ntcore)")
-set(WPILIBC_DEP_REPLACE_IMPL "find_dependency(wpilibc)")
-set(WPILIBJ_DEP_REPLACE "find_dependency(wpilibj)")
-set(WPILIBNEWCOMMANDS_DEP_REPLACE "find_dependency(wpilibNewCommands)")
-set(WPIMATH_DEP_REPLACE "find_dependency(wpimath)")
-set(WPINET_DEP_REPLACE "find_dependency(wpinet)")
-set(WPIUNITS_DEP_REPLACE "find_dependency(wpiunits)")
-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\}")
-
 get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
 if(isMultiConfig)
@@ -356,22 +328,39 @@ if(WITH_TESTS)
     include(GoogleTest)
 endif()
 
+if(USE_SYSTEM_LIBUV)
+    set(LIBUV_SYSTEM_REPLACE "find_dependency(libuv CONFIG)")
+endif()
+
+if(USE_SYSTEM_EIGEN)
+    set(EIGEN_SYSTEM_REPLACE "find_package(Eigen3 CONFIG)")
+endif()
+
+set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)")
+set(SELF_DIR "$\{SELF_DIR\}")
+set(WPIUNITS_DEP_REPLACE_IMPL "find_dependency(wpiunits)")
+set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)")
 add_subdirectory(wpiutil)
 
 if(WITH_NTCORE)
+    set(NTCORE_DEP_REPLACE "find_dependency(ntcore)")
+    set(WPINET_DEP_REPLACE "find_dependency(wpinet)")
     add_subdirectory(wpinet)
     add_subdirectory(ntcore)
 endif()
 
 if(WITH_WPIMATH)
     if(WITH_JAVA)
+        set(WPIUNITS_DEP_REPLACE ${WPIUNITS_DEP_REPLACE_IMPL})
         add_subdirectory(wpiunits)
     endif()
+    set(WPIMATH_DEP_REPLACE "find_dependency(wpimath)")
     add_subdirectory(wpimath)
 endif()
 
 if(WITH_WPIUNITS AND NOT WITH_WPIMATH)
     # In case of building wpiunits standalone
+    set(WPIUNITS_DEP_REPLACE ${WPIUNITS_DEP_REPLACE_IMPL})
     add_subdirectory(wpiunits)
 endif()
 
@@ -389,19 +378,22 @@ if(WITH_GUI)
 endif()
 
 if(WITH_WPILIB OR WITH_SIMULATION_MODULES)
-    set(HAL_DEP_REPLACE ${HAL_DEP_REPLACE_IMPL})
+    set(HAL_DEP_REPLACE "find_dependency(hal)")
     add_subdirectory(hal)
 endif()
 
 if(WITH_CSCORE)
-    set(CSCORE_DEP_REPLACE ${CSCORE_DEP_REPLACE_IMPL})
-    set(CAMERASERVER_DEP_REPLACE ${CAMERASERVER_DEP_REPLACE_IMPL})
+    set(CAMERASERVER_DEP_REPLACE "find_dependency(cameraserver)")
+    set(CSCORE_DEP_REPLACE "find_dependency(cscore)")
     add_subdirectory(cscore)
     add_subdirectory(cameraserver)
 endif()
 
 if(WITH_WPILIB)
-    set(WPILIBC_DEP_REPLACE ${WPILIBC_DEP_REPLACE_IMPL})
+    set(APRILTAG_DEP_REPLACE "find_dependency(apriltag)")
+    set(WPILIBC_DEP_REPLACE "find_dependency(wpilibc)")
+    set(WPILIBJ_DEP_REPLACE "find_dependency(wpilibj)")
+    set(WPILIBNEWCOMMANDS_DEP_REPLACE "find_dependency(wpilibNewCommands)")
     add_subdirectory(apriltag)
     add_subdirectory(wpilibj)
     add_subdirectory(wpilibc)
diff --git a/wpilib-config.cmake.in b/wpilib-config.cmake.in
index c08e9d20012..738524e94f1 100644
--- a/wpilib-config.cmake.in
+++ b/wpilib-config.cmake.in
@@ -12,10 +12,8 @@ find_dependency(Threads)
 @NTCORE_DEP_REPLACE@
 @WPILIBC_DEP_REPLACE@
 @WPILIBNEWCOMMANDS_DEP_REPLACE@
+@WPILIBJ_DEP_REPLACE@
 @WPIMATH_DEP_REPLACE@
 @WPINET_DEP_REPLACE@
+@WPIUNITS_DEP_REPLACE@
 @WPIUTIL_DEP_REPLACE@
-if(@WITH_JAVA@)
-    @WPILIBJ_DEP_REPLACE@
-    @WPIUNITS_DEP_REPLACE@
-endif()