Compare commits

..

4 Commits

Author SHA1 Message Date
2982f37522 PIP_FREERTOS -> PIP_MICRO 2025-10-18 08:17:08 +03:00
f74a38900f fix get_system() 2025-07-17 16:16:53 +03:00
da13c52c51 get_system() in deploy now check if "*release" file exists 2025-07-09 12:43:37 +03:00
698d24e831 new cmake 2025-04-29 21:50:48 +03:00
3 changed files with 9 additions and 7 deletions

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)

View File

@@ -169,7 +169,7 @@ if (POLICY CMP0053)
cmake_policy(SET CMP0053 NEW) cmake_policy(SET CMP0053 NEW)
endif() endif()
if (NOT _dep_exists AND NOT PIP_FREERTOS) if (NOT _dep_exists AND NOT PIP_MICRO)
set(_dep_exists 1) set(_dep_exists 1)
add_custom_target(deploy COMMENT "Deploy") add_custom_target(deploy COMMENT "Deploy")
endif() endif()
@@ -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}")

View File

@@ -59,7 +59,7 @@ macro(shstk_begin_project name)
endif() endif()
shstk_define_option(LOCAL "Local install" OFF) shstk_define_option(LOCAL "Local install" OFF)
if (DEFINED ENV{QNX_HOST} OR PIP_FREERTOS) if (DEFINED ENV{QNX_HOST} OR PIP_MICRO)
set(STATIC_LIB_DEFAULT ON) set(STATIC_LIB_DEFAULT ON)
else() else()
set(STATIC_LIB_DEFAULT OFF) set(STATIC_LIB_DEFAULT OFF)