From 87ce1e3761203cf93cf1cab68eb2b2b35cb77eab Mon Sep 17 00:00:00 2001
From: Gold856 <117957790+Gold856@users.noreply.github.com>
Date: Wed, 20 Sep 2023 00:19:35 -0400
Subject: [PATCH] [build] Fix wpilibNewCommands CMake install (#5671)

---
 README-CMAKE.md                  | 1 +
 wpilib-config.cmake.in           | 1 +
 wpilibNewCommands/CMakeLists.txt | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README-CMAKE.md b/README-CMAKE.md
index 9d92a8a127..f9eeb54176 100644
--- a/README-CMAKE.md
+++ b/README-CMAKE.md
@@ -12,6 +12,7 @@ WPILib is normally built with Gradle, however for some systems, such as Linux ba
 * halsim
 * wpigui
 * wpimath
+* wpilibNewCommands
 
 By default, all libraries except for the HAL and WPILib get built with a default CMake setup. The libraries are built as shared libraries, and include the JNI libraries as well as building the Java JARs.
 
diff --git a/wpilib-config.cmake.in b/wpilib-config.cmake.in
index 36a9d254a4..aaf4bb84f8 100644
--- a/wpilib-config.cmake.in
+++ b/wpilib-config.cmake.in
@@ -11,3 +11,4 @@ find_dependency(Threads)
 @CAMERASERVER_DEP_REPLACE@
 @HAL_DEP_REPLACE@
 @WPILIBC_DEP_REPLACE@
+@WPILIBNEWCOMMANDS_DEP_REPLACE@
diff --git a/wpilibNewCommands/CMakeLists.txt b/wpilibNewCommands/CMakeLists.txt
index fbebf19ea4..d3aa541aa3 100644
--- a/wpilibNewCommands/CMakeLists.txt
+++ b/wpilibNewCommands/CMakeLists.txt
@@ -23,7 +23,7 @@ if (WITH_JAVA)
       set (wpilibNewCommands_config_dir share/wpilibNewCommands)
   endif()
 
-  install(FILES wpilibNewCommands-config.cmake DESTINATION ${wpilibNewCommands_config_dir})
+  install(FILES ${WPILIB_BINARY_DIR}/wpilibNewCommands-config.cmake DESTINATION ${wpilibNewCommands_config_dir})
 endif()
 
 file(GLOB_RECURSE wpilibNewCommands_native_src src/main/native/cpp/*.cpp)