Compare commits
4 Commits
558034bbdb
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 2982f37522 | |||
| f74a38900f | |||
| da13c52c51 | |||
| 698d24e831 |
@@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.0)
|
||||
cmake_minimum_required(VERSION 3.13)
|
||||
project(cmake LANGUAGES NONE)
|
||||
file(GLOB CMAKES "*.cmake" "*.in" "*.keystore")
|
||||
if(INSTALL_DIR)
|
||||
|
||||
@@ -169,7 +169,7 @@ if (POLICY CMP0053)
|
||||
cmake_policy(SET CMP0053 NEW)
|
||||
endif()
|
||||
|
||||
if (NOT _dep_exists AND NOT PIP_FREERTOS)
|
||||
if (NOT _dep_exists AND NOT PIP_MICRO)
|
||||
set(_dep_exists 1)
|
||||
add_custom_target(deploy COMMENT "Deploy")
|
||||
endif()
|
||||
@@ -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}")
|
||||
|
||||
@@ -59,7 +59,7 @@ macro(shstk_begin_project name)
|
||||
endif()
|
||||
|
||||
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)
|
||||
else()
|
||||
set(STATIC_LIB_DEFAULT OFF)
|
||||
|
||||
Reference in New Issue
Block a user