From d06fa282970553609c6e8fd9254f9de27f73fcd3 Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Fri, 20 Dec 2024 08:45:02 -0500 Subject: [PATCH] [build] Fix imgui libraries not being published --- cscore/build.gradle | 2 +- datalogtool/build.gradle | 2 +- glass/build.gradle | 6 +++--- outlineviewer/build.gradle | 2 +- roborioteamnumbersetter/build.gradle | 2 +- simulation/halsim_gui/build.gradle | 2 +- sysid/build.gradle | 4 ++-- thirdparty/imgui_suite/build.gradle | 2 +- wpigui/build.gradle | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cscore/build.gradle b/cscore/build.gradle index 5b2299548d7..792b5114b9c 100644 --- a/cscore/build.gradle +++ b/cscore/build.gradle @@ -185,7 +185,7 @@ model { lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpigui', library: 'wpigui', linkage: 'static' lib library: 'cscore', linkage: 'shared' - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { it.buildable = false return diff --git a/datalogtool/build.gradle b/datalogtool/build.gradle index 96f3c85d1d9..a47d86a4187 100644 --- a/datalogtool/build.gradle +++ b/datalogtool/build.gradle @@ -101,7 +101,7 @@ model { lib project: ':glass', library: 'glass', linkage: 'static' lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' lib project: ':wpigui', library: 'wpigui', linkage: 'static' - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' nativeUtils.useRequiredLibrary(it, 'libssh') if (it.targetPlatform.operatingSystem.isWindows()) { it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib' diff --git a/glass/build.gradle b/glass/build.gradle index 551e6ffaefe..e82af8644f4 100644 --- a/glass/build.gradle +++ b/glass/build.gradle @@ -97,7 +97,7 @@ model { lib project: ':wpimath', library: 'wpimath', linkage: 'shared' lib project: ':wpigui', library: 'wpigui', linkage: 'static' lib project: ':fieldImages', library: 'fieldImages', linkage: 'shared' - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' } appendDebugPathToBinaries(binaries) } @@ -127,7 +127,7 @@ model { lib project: ':wpimath', library: 'wpimath', linkage: 'shared' lib project: ':wpigui', library: 'wpigui', linkage: 'static' lib project: ':fieldImages', library: 'fieldImages', linkage: 'shared' - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' } appendDebugPathToBinaries(binaries) } @@ -167,7 +167,7 @@ model { lib project: ':wpigui', library: 'wpigui', linkage: 'static' lib project: ':fieldImages', library: 'fieldImages', linkage: 'static' nativeUtils.useRequiredLibrary(it, 'opencv_static') - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' if (it.targetPlatform.operatingSystem.isWindows()) { it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib' it.linker.args << '/DELAYLOAD:MF.dll' << '/DELAYLOAD:MFReadWrite.dll' << '/DELAYLOAD:MFPlat.dll' << '/delay:nobind' diff --git a/outlineviewer/build.gradle b/outlineviewer/build.gradle index 31261324eef..08c0166beab 100644 --- a/outlineviewer/build.gradle +++ b/outlineviewer/build.gradle @@ -102,7 +102,7 @@ model { lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' lib project: ':wpigui', library: 'wpigui', linkage: 'static' lib project: ':fieldImages', library: 'fieldImages', linkage: 'static' - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' if (it.targetPlatform.operatingSystem.isWindows()) { it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib' } else if (it.targetPlatform.operatingSystem.isMacOsX()) { diff --git a/roborioteamnumbersetter/build.gradle b/roborioteamnumbersetter/build.gradle index 344dfc96053..2b2cfca3d49 100644 --- a/roborioteamnumbersetter/build.gradle +++ b/roborioteamnumbersetter/build.gradle @@ -103,7 +103,7 @@ model { lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' lib project: ':wpigui', library: 'wpigui', linkage: 'static' nativeUtils.useRequiredLibrary(it, 'libssh') - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' if (it.targetPlatform.operatingSystem.isWindows()) { it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib' it.linker.args << 'ws2_32.lib' << 'advapi32.lib' << 'crypt32.lib' << 'user32.lib' diff --git a/simulation/halsim_gui/build.gradle b/simulation/halsim_gui/build.gradle index 031cc775a8f..6cc265ff033 100644 --- a/simulation/halsim_gui/build.gradle +++ b/simulation/halsim_gui/build.gradle @@ -31,7 +31,7 @@ model { lib project: ':wpinet', library: 'wpinet', linkage: 'shared' lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' lib project: ':fieldImages', library: 'fieldImages', linkage: 'static' - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { it.buildable = false return diff --git a/sysid/build.gradle b/sysid/build.gradle index 58bbcddbe05..14ad6e287e4 100644 --- a/sysid/build.gradle +++ b/sysid/build.gradle @@ -100,7 +100,7 @@ model { lib project: ':wpimath', library: 'wpimath', linkage: 'static' lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' lib project: ':wpigui', library: 'wpigui', linkage: 'static' - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' if (it.targetPlatform.operatingSystem.isWindows()) { it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib' it.linker.args << '/DELAYLOAD:MF.dll' << '/DELAYLOAD:MFReadWrite.dll' << '/DELAYLOAD:MFPlat.dll' << '/delay:nobind' @@ -139,7 +139,7 @@ model { lib project: ':wpimath', library: 'wpimath', linkage: 'static' lib project: ':wpiutil', library: 'wpiutil', linkage: 'static' lib project: ':wpigui', library: 'wpigui', linkage: 'static' - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' if (it.targetPlatform.operatingSystem.isWindows()) { it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib' it.linker.args << '/DELAYLOAD:MF.dll' << '/DELAYLOAD:MFReadWrite.dll' << '/DELAYLOAD:MFPlat.dll' << '/delay:nobind' diff --git a/thirdparty/imgui_suite/build.gradle b/thirdparty/imgui_suite/build.gradle index f5ddcc98830..18b2e8de4bc 100644 --- a/thirdparty/imgui_suite/build.gradle +++ b/thirdparty/imgui_suite/build.gradle @@ -25,7 +25,7 @@ nativeUtils.platformConfigs.named('osxuniversal') { model { components { - imgui(NativeLibrarySpec) { + imguiSuite(NativeLibrarySpec) { sources { cpp { source { diff --git a/wpigui/build.gradle b/wpigui/build.gradle index 959a821fe4b..917e4526888 100644 --- a/wpigui/build.gradle +++ b/wpigui/build.gradle @@ -35,7 +35,7 @@ model { } } binaries.all { - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio) { it.buildable = false return @@ -99,7 +99,7 @@ model { } binaries.all { lib library: 'wpigui' - lib project: ':thirdparty:imgui_suite', library: 'imgui', linkage: 'static' + lib project: ':thirdparty:imgui_suite', library: 'imguiSuite', linkage: 'static' } } }