create libdatalog, move datalog from wpiutil

wpilibsuite · Jan 8, 2025 · 5eece58 · 5eece58
1 parent d429635
commit 5eece58
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -291,6 +291,8 @@ set(WPIUNITS_DEP_REPLACE_IMPL "find_dependency(wpiunits)")
 set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)")
 add_subdirectory(wpiutil)
 
+add_subdirectory(libdatalog)
+
 if(WITH_NTCORE)
     set(NTCORE_DEP_REPLACE "find_dependency(ntcore)")
     set(WPINET_DEP_REPLACE "find_dependency(wpinet)")

diff --git a/libdatalog/CMakeLists.txt b/libdatalog/CMakeLists.txt
@@ -0,0 +1,29 @@
+project(libdatalog)
+
+include(CompileWarnings)
+
+file(
+    GLOB libdatalog_src
+    src/main/native/cpp/*.cpp
+)
+
+add_library(libdatalog ${libdatalog_src})
+set_target_properties(wpiutil PROPERTIES DEBUG_POSTFIX "d")
+
+target_compile_features(libdatalog PUBLIC cxx_std_20)
+if(MSVC)
+    target_compile_options(
+        libdatalog
+        PUBLIC /permissive- /Zc:preprocessor /Zc:__cplusplus /Zc:throwingNew /MP /bigobj /utf-8
+    )
+    target_compile_definitions(libdatalog PRIVATE -D_CRT_SECURE_NO_WARNINGS)
+endif()
+wpilib_target_warnings(libdatalog)
+
+target_include_directories(
+    libdatalog
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
+)
+
+target_link_libraries(libdatalog PRIVATE wpiutil)
diff --git a/wpiutil/src/main/native/cpp/DataLog.cpp → libdatalog/src/main/native/cpp/DataLog.cpp b/wpiutil/src/main/native/cpp/DataLog.cpp → libdatalog/src/main/native/cpp/DataLog.cpp
diff --git a/...in/native/cpp/DataLogBackgroundWriter.cpp → ...in/native/cpp/DataLogBackgroundWriter.cpp b/...in/native/cpp/DataLogBackgroundWriter.cpp → ...in/native/cpp/DataLogBackgroundWriter.cpp
diff --git a/...til/src/main/native/cpp/DataLogReader.cpp → ...log/src/main/native/cpp/DataLogReader.cpp b/...til/src/main/native/cpp/DataLogReader.cpp → ...log/src/main/native/cpp/DataLogReader.cpp
diff --git a/...c/main/native/cpp/DataLogReaderThread.cpp → ...c/main/native/cpp/DataLogReaderThread.cpp b/...c/main/native/cpp/DataLogReaderThread.cpp → ...c/main/native/cpp/DataLogReaderThread.cpp
diff --git a/...til/src/main/native/cpp/DataLogWriter.cpp → ...log/src/main/native/cpp/DataLogWriter.cpp b/...til/src/main/native/cpp/DataLogWriter.cpp → ...log/src/main/native/cpp/DataLogWriter.cpp
diff --git a/...til/src/main/native/include/wpi/DataLog.h → ...log/src/main/native/include/wpi/DataLog.h b/...til/src/main/native/include/wpi/DataLog.h → ...log/src/main/native/include/wpi/DataLog.h
diff --git a/...ive/include/wpi/DataLogBackgroundWriter.h → ...ive/include/wpi/DataLogBackgroundWriter.h b/...ive/include/wpi/DataLogBackgroundWriter.h → ...ive/include/wpi/DataLogBackgroundWriter.h
diff --git a/...c/main/native/include/wpi/DataLogReader.h → ...c/main/native/include/wpi/DataLogReader.h b/...c/main/native/include/wpi/DataLogReader.h → ...c/main/native/include/wpi/DataLogReader.h
diff --git a/.../native/include/wpi/DataLogReaderThread.h → .../native/include/wpi/DataLogReaderThread.h b/.../native/include/wpi/DataLogReaderThread.h → .../native/include/wpi/DataLogReaderThread.h
diff --git a/...c/main/native/include/wpi/DataLogWriter.h → ...c/main/native/include/wpi/DataLogWriter.h b/...c/main/native/include/wpi/DataLogWriter.h → ...c/main/native/include/wpi/DataLogWriter.h
diff --git a/...l/src/main/native/include/wpi/DataLog_c.h → ...g/src/main/native/include/wpi/DataLog_c.h b/...l/src/main/native/include/wpi/DataLog_c.h → ...g/src/main/native/include/wpi/DataLog_c.h