SHS/cmake
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get_system() in deploy now check if "*release" file exists

Browse Source
This commit is contained in:
Пелипенко Иван
2025-07-09 12:43:37 +03:00
parent 698d24e831
commit da13c52c51
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DeployMacros.cmake
View File

@@ -377,7 +377,7 @@ macro(get_system _OS _ARCH)
endforeach() endforeach()
endif() endif()
find_file(_release_file NAMES os-release lsb-release PATHS ${_paths} NO_DEFAULT_PATH) find_file(_release_file NAMES os-release lsb-release PATHS ${_paths} NO_DEFAULT_PATH)
if (NOT "x${_release_file}" STREQUAL "x") if ("${_release_file}")
file(STRINGS "${_release_file}" _lines) file(STRINGS "${_release_file}" _lines)
foreach(_l ${_lines}) foreach(_l ${_lines})
if ("${_l}" MATCHES "VERSION_ID=.*") if ("${_l}" MATCHES "VERSION_ID=.*")
@@ -390,9 +390,11 @@ macro(get_system _OS _ARCH)
#message("ID ${_os_id}") #message("ID ${_os_id}")
endif() endif()
endforeach() endforeach()
endif() string(TOLOWER "${_os_id}${_os_ver}" ${_OS})
string(TOLOWER "${_os_id}${_os_ver}" ${_OS}) if ("x${${_OS}}" STREQUAL "x")
if ("x${${_OS}}" STREQUAL "x") set(${_OS} "linux")
endif()
else()
set(${_OS} "linux") set(${_OS} "linux")
endif() endif()
set(${_ARCH} "${MY_ARCH}") set(${_ARCH} "${MY_ARCH}")