[build] Fix cmake-config files (#2865)

In the cmake config files, SELF_DIR was being overwritten and was therefore incorrect. This also adds wpimath as a dependency to wpilibc.
2026-06-19 00:41:43 +00:00 · 2020-11-16 00:38:55 -06:00
parent fc27fdac57
commit f61726b5ae
7 changed files with 8 additions and 0 deletions
--- a/cameraserver/cameraserver-config.cmake.in
+++ b/cameraserver/cameraserver-config.cmake.in
@@ -5,4 +5,5 @@ include(CMakeFindDependencyMacro)
@CSCORE_DEP_REPLACE@
 find_dependency(OpenCV)

+@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/cameraserver.cmake)
--- a/cscore/cscore-config.cmake.in
+++ b/cscore/cscore-config.cmake.in
@@ -3,4 +3,5 @@ include(CMakeFindDependencyMacro)
@WPIUTIL_DEP_REPLACE@
 find_dependency(OpenCV)

+@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/cscore.cmake)
--- a/hal/hal-config.cmake.in
+++ b/hal/hal-config.cmake.in
@@ -2,4 +2,5 @@ include(CMakeFindDependencyMacro)
@FILENAME_DEP_REPLACE@
@WPIUTIL_DEP_REPLACE@

+@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/hal.cmake)
--- a/ntcore/ntcore-config.cmake.in
+++ b/ntcore/ntcore-config.cmake.in
@@ -2,4 +2,5 @@ include(CMakeFindDependencyMacro)
@FILENAME_DEP_REPLACE@
@WPIUTIL_DEP_REPLACE@

+@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/ntcore.cmake)
--- a/wpilibc/wpilibc-config.cmake.in
+++ b/wpilibc/wpilibc-config.cmake.in
@@ -1,9 +1,11 @@
 include(CMakeFindDependencyMacro)
@FILENAME_DEP_REPLACE@
@WPIUTIL_DEP_REPLACE@
+@WPIMATH_DEP_REPLACE@
@NTCORE_DEP_REPLACE@
@CSCORE_DEP_REPLACE@
@CAMERASERVER_DEP_REPLACE@
@HAL_DEP_REPLACE@

+@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/wpilibc.cmake)
--- a/wpimath/wpimath-config.cmake.in
+++ b/wpimath/wpimath-config.cmake.in
@@ -2,4 +2,5 @@ include(CMakeFindDependencyMacro)
@FILENAME_DEP_REPLACE@
@WPIUTIL_DEP_REPLACE@

+@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/wpimath.cmake)
--- a/wpiutil/wpiutil-config.cmake.in
+++ b/wpiutil/wpiutil-config.cmake.in
@@ -5,4 +5,5 @@ find_dependency(Threads)
@LIBUV_VCPKG_REPLACE@
@EIGEN_VCPKG_REPLACE@

+@FILENAME_DEP_REPLACE@
 include(${SELF_DIR}/wpiutil.cmake)