[sysid] Remove unused dependency on libglassnt (#7200)

Also remove stale libuv references.
wpilibsuite · Oct 12, 2024 · f23bece · f23bece
1 parent 7ebd45e
commit f23bece
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/sysid/CMakeLists.txt b/sysid/CMakeLists.txt
@@ -25,7 +25,7 @@ endif()
 wpilib_link_macos_gui(sysid)
 wpilib_target_warnings(sysid)
 target_include_directories(sysid PRIVATE src/main/native/include)
-target_link_libraries(sysid wpimath libglassnt libglass)
+target_link_libraries(sysid wpimath libglass)
 
 if(WIN32)
     set_target_properties(sysid PROPERTIES WIN32_EXECUTABLE YES)
@@ -42,5 +42,5 @@ if(WITH_TESTS)
         target_compile_options(sysid_test PRIVATE /utf-8)
     endif()
     target_include_directories(sysid_test PRIVATE src/main/native/cpp src/main/native/include)
-    target_link_libraries(sysid_test wpimath libglassnt libglass googletest)
+    target_link_libraries(sysid_test wpimath libglass googletest)
 endif()
diff --git a/sysid/build.gradle b/sysid/build.gradle
@@ -96,10 +96,7 @@ model {
                     it.buildable = false
                     return
                 }
-                lib project: ':glass', library: 'glassnt', linkage: 'static'
                 lib project: ':glass', library: 'glass', linkage: 'static'
-                project(':ntcore').addNtcoreDependency(it, 'static')
-                lib project: ':wpinet', library: 'wpinet', linkage: 'static'
                 lib project: ':wpimath', library: 'wpimath', linkage: 'static'
                 lib project: ':wpiutil', library: 'wpiutil', linkage: 'static'
                 lib project: ':wpigui', library: 'wpigui', linkage: 'static'
@@ -138,10 +135,7 @@ model {
                     it.buildable = false
                     return
                 }
-                lib project: ':glass', library: 'glassnt', linkage: 'static'
                 lib project: ':glass', library: 'glass', linkage: 'static'
-                project(':ntcore').addNtcoreDependency(it, 'static')
-                lib project: ':wpinet', library: 'wpinet', linkage: 'static'
                 lib project: ':wpimath', library: 'wpimath', linkage: 'static'
                 lib project: ':wpiutil', library: 'wpiutil', linkage: 'static'
                 lib project: ':wpigui', library: 'wpigui', linkage: 'static'

diff --git a/sysid/src/main/native/cpp/App.cpp b/sysid/src/main/native/cpp/App.cpp
@@ -19,7 +19,6 @@
 #include <glass/WindowManager.h>
 #include <glass/other/Log.h>
 #include <imgui.h>
-#include <uv.h>
 #include <wpi/Logger.h>
 #include <wpi/print.h>
 #include <wpigui.h>
@@ -96,8 +95,6 @@ void Application(std::string_view saveDir) {
   });
 
   gLogger.set_min_level(wpi::WPI_LOG_DEBUG);
-  // Set the number of workers for the libuv threadpool.
-  uv_os_setenv("UV_THREADPOOL_SIZE", "6");
 
   // Initialize window manager and add views.
   auto& storage = glass::GetStorageRoot().GetChild("SysId");