From ffedda27ef29709c45852462a0e6d13128a9a484 Mon Sep 17 00:00:00 2001 From: Ryan Freeman Date: Sat, 15 Jun 2024 08:32:13 +0100 Subject: [PATCH] removed system requirement for lsb_release 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 --- shared/traintastic.cmake | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/shared/traintastic.cmake b/shared/traintastic.cmake index bd4817fa..ef333d47 100644 --- a/shared/traintastic.cmake +++ b/shared/traintastic.cmake @@ -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