Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpigui] Only build static for both gradle and cmake (#2703)

Browse Source 
Final use of wpigui is essentially always the static library.
This commit is contained in:
Peter Johnson
2020-09-13 00:34:28 -07:00
committed by GitHub
parent 67e1796ef6
commit 56972447b2
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/config.gradle
View File

@@ -11,7 +11,7 @@ nativeUtils {
niLibVersion = "2020.10.1"
opencvVersion = "3.4.7-3"
googleTestVersion = "1.9.0-5-437e100-1"
imguiVersion = "1.76-7"
imguiVersion = "1.76-9"
wpimathVersion = "-1"
}
}

5
wpigui/CMakeLists.txt
View File

@@ -7,13 +7,14 @@ file(GLOB wpigui_windows_src src/main/native/directx11/*.cpp)
file(GLOB wpigui_mac_src src/main/native/metal/*.mm)
file(GLOB wpigui_unix_src src/main/native/opengl3/*.cpp)
add_library(wpigui ${wpigui_src})
add_library(wpigui STATIC ${wpigui_src})
set_target_properties(wpigui PROPERTIES DEBUG_POSTFIX "d")
set_property(TARGET wpigui PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET wpigui PROPERTY FOLDER "libraries")
wpilib_target_warnings(wpigui)
target_link_libraries(wpigui imgui)
target_link_libraries(wpigui PUBLIC imgui)
target_include_directories(wpigui PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>

5
wpigui/build.gradle
View File

@@ -92,7 +92,6 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra
source {
srcDirs 'src/dev/native/cpp'
include '**/*.cpp'
lib library: 'wpigui'
}
exportedHeaders {
srcDirs 'src/dev/native/include'
@@ -100,6 +99,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra
}
}
binaries.all {
lib library: 'wpigui'
nativeUtils.useRequiredLibrary(it, 'imgui_static')
}
}
@@ -118,6 +118,9 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra
it.linker.args << '-lX11'
}
}
withType(SharedLibraryBinarySpec) {
buildable = false
}
}
}