From 0657014cc14341f87683383898780484b21b5ebb Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Sat, 12 Oct 2024 00:33:33 -0400 Subject: [PATCH] [sysid] Remove unused dependency on libglassnt --- sysid/CMakeLists.txt | 4 ++-- sysid/build.gradle | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sysid/CMakeLists.txt b/sysid/CMakeLists.txt index cb748071f60..8bcb224d4dc 100644 --- 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 index 3890a7bb36c..58bbcddbe05 100644 --- 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'