From 22ed2240354a0547c7f28863305b0fd7a8378790 Mon Sep 17 00:00:00 2001
From: Gold856 <117957790+Gold856@users.noreply.github.com>
Date: Sat, 26 Jul 2025 17:48:58 -0400
Subject: [PATCH] [build] Clean up DataLog CMake build (#8116)

---
 CMakeLists.txt                                      |  1 +
 cameraserver/cameraserver-config.cmake.in           |  1 +
 datalog/CMakeLists.txt                              | 10 +---------
 datalog/datalog-config.cmake.in                     |  4 ++--
 ntcore/ntcore-config.cmake.in                       |  1 +
 romiVendordep/romivendordep-config.cmake.in         |  1 +
 wpilib-config.cmake.in                              |  1 +
 wpilibNewCommands/wpilibnewcommands-config.cmake.in |  1 +
 wpilibc/wpilibc-config.cmake.in                     |  1 +
 xrpVendordep/xrpvendordep-config.cmake.in           |  1 +
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9e20b8755..accb155171 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -290,6 +290,7 @@ set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIS
 set(SELF_DIR "$\{SELF_DIR\}")
 set(WPIUNITS_DEP_REPLACE_IMPL "find_dependency(wpiunits)")
 set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)")
+set(DATALOG_DEP_REPLACE "find_dependency(datalog)")
 add_subdirectory(wpiutil)
 
 add_subdirectory(datalog)
diff --git a/cameraserver/cameraserver-config.cmake.in b/cameraserver/cameraserver-config.cmake.in
index 46d522d121..a42849d59f 100644
--- a/cameraserver/cameraserver-config.cmake.in
+++ b/cameraserver/cameraserver-config.cmake.in
@@ -1,6 +1,7 @@
 include(CMakeFindDependencyMacro)
 @FILENAME_DEP_REPLACE@
 @WPIUTIL_DEP_REPLACE@
+@DATALOG_DEP_REPLACE@
 @NTCORE_DEP_REPLACE@
 @CSCORE_DEP_REPLACE@
 find_dependency(OpenCV)
diff --git a/datalog/CMakeLists.txt b/datalog/CMakeLists.txt
index 2e31dc10c4..bc9107cefb 100644
--- a/datalog/CMakeLists.txt
+++ b/datalog/CMakeLists.txt
@@ -11,13 +11,6 @@ add_library(datalog ${datalog_native_src})
 set_target_properties(datalog PROPERTIES DEBUG_POSTFIX "d")
 
 target_compile_features(datalog PUBLIC cxx_std_20)
-if(MSVC)
-    target_compile_options(
-        datalog
-        PUBLIC /permissive- /Zc:preprocessor /Zc:__cplusplus /Zc:throwingNew /MP /bigobj /utf-8
-    )
-    target_compile_definitions(datalog PRIVATE -D_CRT_SECURE_NO_WARNINGS)
-endif()
 wpilib_target_warnings(datalog)
 
 target_include_directories(
@@ -25,7 +18,7 @@ target_include_directories(
     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
 )
 
-target_link_libraries(datalog PRIVATE wpiutil)
+target_link_libraries(datalog PUBLIC wpiutil)
 
 subdir_list(datalog_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples")
 foreach(example ${datalog_examples})
@@ -50,7 +43,6 @@ if(WITH_JAVA)
     add_jar(
         datalog_jar
         ${JAVA_SOURCES}
-        # INCLUDE_JARS ${JACKSON_JARS} ${QUICKBUF_JAR}
         INCLUDE_JARS wpiutil_jar ${QUICKBUF_JAR}
         OUTPUT_NAME datalog
         OUTPUT_DIR ${WPILIB_BINARY_DIR}/${java_lib_dest}
diff --git a/datalog/datalog-config.cmake.in b/datalog/datalog-config.cmake.in
index eb26b9cb31..b29ea23135 100644
--- a/datalog/datalog-config.cmake.in
+++ b/datalog/datalog-config.cmake.in
@@ -1,5 +1,5 @@
 @FILENAME_DEP_REPLACE@
-include(${SELF_DIR}/wpiutil.cmake)
+include(${SELF_DIR}/datalog.cmake)
 if(@WITH_JAVA@)
-    include(${SELF_DIR}/wpiutil_jar.cmake)
+    include(${SELF_DIR}/datalog_jar.cmake)
 endif()
diff --git a/ntcore/ntcore-config.cmake.in b/ntcore/ntcore-config.cmake.in
index 9642d635ae..9c11816bdd 100644
--- a/ntcore/ntcore-config.cmake.in
+++ b/ntcore/ntcore-config.cmake.in
@@ -1,6 +1,7 @@
 include(CMakeFindDependencyMacro)
 @FILENAME_DEP_REPLACE@
 @WPIUTIL_DEP_REPLACE@
+@DATALOG_DEP_REPLACE@
 @WPINET_DEP_REPLACE@
 
 @FILENAME_DEP_REPLACE@
diff --git a/romiVendordep/romivendordep-config.cmake.in b/romiVendordep/romivendordep-config.cmake.in
index d4a80f0d6a..2408be27ca 100644
--- a/romiVendordep/romivendordep-config.cmake.in
+++ b/romiVendordep/romivendordep-config.cmake.in
@@ -1,5 +1,6 @@
 include(CMakeFindDependencyMacro)
 @WPIUTIL_DEP_REPLACE@
+@DATALOG_DEP_REPLACE@
 @NTCORE_DEP_REPLACE@
 @CSCORE_DEP_REPLACE@
 @CAMERASERVER_DEP_REPLACE@
diff --git a/wpilib-config.cmake.in b/wpilib-config.cmake.in
index 738524e94f..30080f24d9 100644
--- a/wpilib-config.cmake.in
+++ b/wpilib-config.cmake.in
@@ -8,6 +8,7 @@ find_dependency(Threads)
 @APRILTAG_DEP_REPLACE@
 @CAMERASERVER_DEP_REPLACE@
 @CSCORE_DEP_REPLACE@
+@DATALOG_DEP_REPLACE@
 @HAL_DEP_REPLACE@
 @NTCORE_DEP_REPLACE@
 @WPILIBC_DEP_REPLACE@
diff --git a/wpilibNewCommands/wpilibnewcommands-config.cmake.in b/wpilibNewCommands/wpilibnewcommands-config.cmake.in
index b26b9a7a55..52dfac957b 100644
--- a/wpilibNewCommands/wpilibnewcommands-config.cmake.in
+++ b/wpilibNewCommands/wpilibnewcommands-config.cmake.in
@@ -1,5 +1,6 @@
 include(CMakeFindDependencyMacro)
 @WPIUTIL_DEP_REPLACE@
+@DATALOG_DEP_REPLACE@
 @NTCORE_DEP_REPLACE@
 @CSCORE_DEP_REPLACE@
 @CAMERASERVER_DEP_REPLACE@
diff --git a/wpilibc/wpilibc-config.cmake.in b/wpilibc/wpilibc-config.cmake.in
index 3518a7f860..dfddd532b5 100644
--- a/wpilibc/wpilibc-config.cmake.in
+++ b/wpilibc/wpilibc-config.cmake.in
@@ -1,6 +1,7 @@
 include(CMakeFindDependencyMacro)
 @FILENAME_DEP_REPLACE@
 @WPIUTIL_DEP_REPLACE@
+@DATALOG_DEP_REPLACE@
 @WPIMATH_DEP_REPLACE@
 @NTCORE_DEP_REPLACE@
 @CSCORE_DEP_REPLACE@
diff --git a/xrpVendordep/xrpvendordep-config.cmake.in b/xrpVendordep/xrpvendordep-config.cmake.in
index 8cb66bb114..efd96fe387 100644
--- a/xrpVendordep/xrpvendordep-config.cmake.in
+++ b/xrpVendordep/xrpvendordep-config.cmake.in
@@ -1,5 +1,6 @@
 include(CMakeFindDependencyMacro)
 @WPIUTIL_DEP_REPLACE@
+@DATALOG_DEP_REPLACE@
 @NTCORE_DEP_REPLACE@
 @CSCORE_DEP_REPLACE@
 @CAMERASERVER_DEP_REPLACE@