Merge branch 'master' of https://git.shstk.ru/SHS/cmake

2026-01-29 12:46:23 +03:00
parent 0c0ccb1515 2982f37522
commit 28e7ef2205
2 changed files with 2 additions and 2 deletions
--- a/DeployMacros.cmake
+++ b/DeployMacros.cmake
@@ -171,7 +171,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()
--- a/SHSTKMacros.cmake
+++ b/SHSTKMacros.cmake
@@ -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)