[build] Clean up DataLog CMake build (#8116)

2026-06-19 00:41:43 +00:00 · 2025-07-26 17:48:58 -04:00
parent 8d36df671b
commit 22ed224035
10 changed files with 11 additions and 11 deletions
--- 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)
--- 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)
--- 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}
--- 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()
--- 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@
--- 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@
--- 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@
--- 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@
--- 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@
--- 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@