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

Compare commits

base: SHS:0d3b2ded8e8572d5d06f5a9dbca7ca93005b37c9
Branches Tags
SHS:master SHS:cmake_refactor
...
compare: SHS:master
Branches Tags
SHS:master SHS:cmake_refactor

6 Commits
0d3b2ded8e ... master

Author SHA1 Message Date
Andrey Bychkov
2982f37522 PIP_FREERTOS -> PIP_MICRO 2025-10-18 08:17:08 +03:00
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
peri4
558034bbdb fix shstk_find_header 2025-01-08 17:35:05 +03:00
peri4
7784497165 set <T>_BUILDTYPE in several places for 100% coverage 2024-12-19 21:22:57 +03:00
4 changed files with 12 additions and 8 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)

12
DeployMacros.cmake
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}")

3
DeployVersionMacros.cmake
View File

@@ -125,7 +125,7 @@ endmacro()
macro(import_version _T _F) macro(import_version _T _F)
if (NOT "x${_T}" STREQUAL "x${_F}") if (NOT "x${_T}" STREQUAL "x${_F}")
set(_names "${__version_names};FULLSUFFIX") set(_names "${__version_names};FULLSUFFIX;BUILDTYPE")
foreach(_i ${_names}) foreach(_i ${_names})
set(${_T}_VERSION_${_i} "${${_F}_VERSION_${_i}}") set(${_T}_VERSION_${_i} "${${_F}_VERSION_${_i}}")
endforeach() endforeach()
@@ -162,6 +162,7 @@ macro(set_deploy_property _T)
set(${_T}_${_name} ${_i}) set(${_T}_${_name} ${_i})
endif() endif()
endforeach() endforeach()
set(${_T}_BUILDTYPE "${CMAKE_BUILD_TYPE}")
endmacro() endmacro()

3
SHSTKMacros.cmake
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)
@@ -305,6 +305,7 @@ endmacro()
macro(shstk_find_header name filename add_find_info) macro(shstk_find_header name filename add_find_info)
string(TOUPPER "${name}" ${name}_uppercase) string(TOUPPER "${name}" ${name}_uppercase)
if(NOT ${name}_VERSION) if(NOT ${name}_VERSION)
find_file(${name}_H_INCLUDE "${filename}" HINTS ${${name}_INCDIR} NO_CMAKE_FIND_ROOT_PATH)
find_file(${name}_H_INCLUDE "${filename}" HINTS ${${name}_INCDIR}) find_file(${name}_H_INCLUDE "${filename}" HINTS ${${name}_INCDIR})
#message("${name}_H_INCLUDE \"${filename}\" HINTS \"${${name}_INCDIR}\" = \"${${name}_H_INCLUDE}\"") #message("${name}_H_INCLUDE \"${filename}\" HINTS \"${${name}_INCDIR}\" = \"${${name}_H_INCLUDE}\"")
if (NOT ${name}_H_INCLUDE) if (NOT ${name}_H_INCLUDE)