get_system() in deploy now check if "*release" file exists
This commit is contained in:
@@ -377,7 +377,7 @@ macro(get_system _OS _ARCH)
|
||||
endforeach()
|
||||
endif()
|
||||
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)
|
||||
foreach(_l ${_lines})
|
||||
if ("${_l}" MATCHES "VERSION_ID=.*")
|
||||
@@ -390,9 +390,11 @@ macro(get_system _OS _ARCH)
|
||||
#message("ID ${_os_id}")
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
string(TOLOWER "${_os_id}${_os_ver}" ${_OS})
|
||||
if ("x${${_OS}}" STREQUAL "x")
|
||||
string(TOLOWER "${_os_id}${_os_ver}" ${_OS})
|
||||
if ("x${${_OS}}" STREQUAL "x")
|
||||
set(${_OS} "linux")
|
||||
endif()
|
||||
else()
|
||||
set(${_OS} "linux")
|
||||
endif()
|
||||
set(${_ARCH} "${MY_ARCH}")
|
||||
|
||||
Reference in New Issue
Block a user