mirror of
https://github.com/spalencsar/bearwave.git
synced 2026-07-06 22:24:17 +02:00
fix: About dialog crash and flatpak build id (1.0.5 pkgrel 8)
Replace the tall ScrollView/license layout that crashed under KDE Dialog with a compact layout matching the other dialogs. Inject BEARWAVE_GIT_HASH into flatpak builds via manifest env (no .git in builder sandbox).
This commit is contained in:
@@ -18,13 +18,19 @@ set(SOURCES
|
||||
# Create executable
|
||||
add_executable(bearwave ${SOURCES})
|
||||
|
||||
execute_process(
|
||||
COMMAND git rev-parse --short HEAD
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
OUTPUT_VARIABLE BEARWAVE_GIT_HASH
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET
|
||||
)
|
||||
if(BEARWAVE_GIT_HASH)
|
||||
# set via -D from build scripts
|
||||
elseif(DEFINED ENV{BEARWAVE_GIT_HASH} AND NOT "$ENV{BEARWAVE_GIT_HASH}" STREQUAL "")
|
||||
set(BEARWAVE_GIT_HASH "$ENV{BEARWAVE_GIT_HASH}")
|
||||
else()
|
||||
execute_process(
|
||||
COMMAND git rev-parse --short HEAD
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
OUTPUT_VARIABLE BEARWAVE_GIT_HASH
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET
|
||||
)
|
||||
endif()
|
||||
if(NOT BEARWAVE_GIT_HASH)
|
||||
set(BEARWAVE_GIT_HASH "unknown")
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user