[build] Fix cmake config files (wpilibsuite#5624)

rzblue · Sep 11, 2023 · 7a9a901 · 7a9a901
1 parent 298f8a6
commit 7a9a901
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/wpilibNewCommands/wpilibNewCommands-config.cmake.in b/wpilibNewCommands/wpilibNewCommands-config.cmake.in
@@ -1,5 +1,4 @@
 include(CMakeFindDependencyMacro)
- @FILENAME_DEP_REPLACE@
  @WPIUTIL_DEP_REPLACE@
  @NTCORE_DEP_REPLACE@
  @CSCORE_DEP_REPLACE@
@@ -8,4 +7,5 @@ include(CMakeFindDependencyMacro)
  @WPILIBC_DEP_REPLACE@
  @WPIMATH_DEP_REPLACE@
 
+ @FILENAME_DEP_REPLACE@
  include(${SELF_DIR}/wpilibNewCommands.cmake)
diff --git a/wpimath/wpimath-config.cmake.in b/wpimath/wpimath-config.cmake.in
@@ -2,5 +2,9 @@ include(CMakeFindDependencyMacro)
 @FILENAME_DEP_REPLACE@
 @WPIUTIL_DEP_REPLACE@
 
+if(@USE_SYSTEM_EIGEN@)
+    find_dependency(Eigen3)
+endif()
+
 @FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/wpimath.cmake)
diff --git a/wpiutil/wpiutil-config.cmake.in b/wpiutil/wpiutil-config.cmake.in
@@ -4,5 +4,9 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_dependency(Threads)
 @FMTLIB_SYSTEM_REPLACE@
 
+if(@USE_SYSTEM_FMTLIB@)
+    find_dependency(fmt)
+endif()
+
 @FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/wpiutil.cmake)