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

Compare commits

base: SHS:558034bbdb8872e1fd6bb69190adb3c837bbcbca
Branches Tags
SHS:master SHS:cmake_refactor
...
compare: SHS:f74a38900f65077f0ce554271deb36ce411b0706
Branches Tags
SHS:master SHS:cmake_refactor

3 Commits
558034bbdb ... f74a38900f

Author SHA1 Message Date
peri4
f74a38900f fix get_system() 2025-07-17 16:16:53 +03:00
peri4
da13c52c51 get_system() in deploy now check if "*release" file exists 2025-07-09 12:43:37 +03:00
peri4
698d24e831 new cmake 2025-04-29 21:50:48 +03:00
2 changed files with 7 additions and 5 deletions
Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.13)
project(cmake LANGUAGES NONE) project(cmake LANGUAGES NONE)
file(GLOB CMAKES "*.cmake" "*.in" "*.keystore") file(GLOB CMAKES "*.cmake" "*.in" "*.keystore")
if(INSTALL_DIR) if(INSTALL_DIR)

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}")