Skip to content

Commit f23bece

Browse files
authored
[sysid] Remove unused dependency on libglassnt (#7200)
Also remove stale libuv references.
1 parent 7ebd45e commit f23bece

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

sysid/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ endif()
2525
wpilib_link_macos_gui(sysid)
2626
wpilib_target_warnings(sysid)
2727
target_include_directories(sysid PRIVATE src/main/native/include)
28-
target_link_libraries(sysid wpimath libglassnt libglass)
28+
target_link_libraries(sysid wpimath libglass)
2929

3030
if(WIN32)
3131
set_target_properties(sysid PROPERTIES WIN32_EXECUTABLE YES)
@@ -42,5 +42,5 @@ if(WITH_TESTS)
4242
target_compile_options(sysid_test PRIVATE /utf-8)
4343
endif()
4444
target_include_directories(sysid_test PRIVATE src/main/native/cpp src/main/native/include)
45-
target_link_libraries(sysid_test wpimath libglassnt libglass googletest)
45+
target_link_libraries(sysid_test wpimath libglass googletest)
4646
endif()

sysid/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,7 @@ model {
9696
it.buildable = false
9797
return
9898
}
99-
lib project: ':glass', library: 'glassnt', linkage: 'static'
10099
lib project: ':glass', library: 'glass', linkage: 'static'
101-
project(':ntcore').addNtcoreDependency(it, 'static')
102-
lib project: ':wpinet', library: 'wpinet', linkage: 'static'
103100
lib project: ':wpimath', library: 'wpimath', linkage: 'static'
104101
lib project: ':wpiutil', library: 'wpiutil', linkage: 'static'
105102
lib project: ':wpigui', library: 'wpigui', linkage: 'static'
@@ -138,10 +135,7 @@ model {
138135
it.buildable = false
139136
return
140137
}
141-
lib project: ':glass', library: 'glassnt', linkage: 'static'
142138
lib project: ':glass', library: 'glass', linkage: 'static'
143-
project(':ntcore').addNtcoreDependency(it, 'static')
144-
lib project: ':wpinet', library: 'wpinet', linkage: 'static'
145139
lib project: ':wpimath', library: 'wpimath', linkage: 'static'
146140
lib project: ':wpiutil', library: 'wpiutil', linkage: 'static'
147141
lib project: ':wpigui', library: 'wpigui', linkage: 'static'

sysid/src/main/native/cpp/App.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <glass/WindowManager.h>
2020
#include <glass/other/Log.h>
2121
#include <imgui.h>
22-
#include <uv.h>
2322
#include <wpi/Logger.h>
2423
#include <wpi/print.h>
2524
#include <wpigui.h>
@@ -96,8 +95,6 @@ void Application(std::string_view saveDir) {
9695
});
9796

9897
gLogger.set_min_level(wpi::WPI_LOG_DEBUG);
99-
// Set the number of workers for the libuv threadpool.
100-
uv_os_setenv("UV_THREADPOOL_SIZE", "6");
10198

10299
// Initialize window manager and add views.
103100
auto& storage = glass::GetStorageRoot().GetChild("SysId");

0 commit comments

Comments
 (0)