MRR/traintastic
1
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

removed system requirement for lsb_release

Quellcode durchsuchen 
removed system level requirement for lsb_release which isn't always installed on all Linux distros.

Cmake has an inbuilt function for getting host system-level environment variables.

https://cmake.org/cmake/help/latest/command/cmake_host_system_information.html#query-host-system-specific-information
Dieser Commit ist enthalten in:
Ryan Freeman 2024-06-15 08:32:13 +01:00 committet von GitHub
Ursprung 86099cb4f8
Commit ffedda27ef
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194
1 geänderte Dateien mit 5 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

13
shared/traintastic.cmake
Datei anzeigen

@ -24,16 +24,13 @@ endif()
# Debian package
if(LINUX)
execute_process(COMMAND lsb_release -i -s OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE LSB_RELEASE_ID)
execute_process(COMMAND lsb_release -c -s OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE LSB_RELEASE_CODENAME)
cmake_host_system_information(RESULT DISTRO QUERY DISTRIB_ID_LIKE)
cmake_host_system_information(RESULT CODENAME QUERY DISTRIB_VERSION_CODENAME)
string(TOLOWER ${LSB_RELEASE_ID} LSB_RELEASE_ID)
string(TOLOWER ${LSB_RELEASE_CODENAME} LSB_RELEASE_CODENAME)
message(STATUS "distro id is ${DISTRO}")
message(STATUS "release codename is ${CODENAME}")
message(STATUS "lsb_release id is ${LSB_RELEASE_ID}")
message(STATUS "lsb_release codename is ${LSB_RELEASE_CODENAME}")
string(REPLACE "-" "~" DEBIAN_PACKAGE_VERSION_EXTRA ~${LSB_RELEASE_ID}~${LSB_RELEASE_CODENAME}${TRAINTASTIC_VERSION_EXTRA})
string(REPLACE "-" "~" DEBIAN_PACKAGE_VERSION_EXTRA ~${DISTRO}~${CODENAME}${TRAINTASTIC_VERSION_EXTRA})
endif()
# Debug