mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
[glass] Change basename of glass to Glass (#2915)
Was glassApp, which makes building an extraction setup much harder.
This commit is contained in:
@@ -51,11 +51,11 @@ install(DIRECTORY src/libnt/native/include/ DESTINATION "${include_dest}/glass")
|
||||
|
||||
file(GLOB glass_src src/app/native/cpp/*.cpp)
|
||||
|
||||
add_executable(glass ${glass_src})
|
||||
wpilib_link_macos_gui(glass)
|
||||
target_link_libraries(glass libglassnt libglass)
|
||||
add_executable(Glass ${glass_src})
|
||||
wpilib_link_macos_gui(Glass)
|
||||
target_link_libraries(Glass libglassnt libglass)
|
||||
if (WIN32)
|
||||
set_target_properties(glass PROPERTIES WIN32_EXECUTABLE YES)
|
||||
set_target_properties(Glass PROPERTIES WIN32_EXECUTABLE YES)
|
||||
endif()
|
||||
|
||||
#if (MSVC OR FLAT_INSTALL_WPILIB)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<key>CFBundleName</key>
|
||||
<string>Glass</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>glassApp</string>
|
||||
<string>Glass</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>Glass</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
|
||||
@@ -92,6 +92,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra
|
||||
// By default, a development executable will be generated. This is to help the case of
|
||||
// testing specific functionality of the library.
|
||||
"${nativeName}App"(NativeExecutableSpec) {
|
||||
baseName = 'Glass'
|
||||
sources {
|
||||
cpp {
|
||||
source {
|
||||
|
||||
@@ -9,7 +9,7 @@ model {
|
||||
def tasks = []
|
||||
$.components.each { component ->
|
||||
component.binaries.each { binary ->
|
||||
if (binary in NativeExecutableBinarySpec && binary.application.name.contains("glassApp")) {
|
||||
if (binary in NativeExecutableBinarySpec && binary.component.name.contains("glassApp")) {
|
||||
if (binary.buildable && binary.name.contains("Release")) {
|
||||
// We are now in the binary that we want.
|
||||
// This is the default application path for the ZIP task.
|
||||
|
||||
Reference in New Issue
Block a user