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

DeployMacros.cmake

@@ -86,6 +86,7 @@ deploy_target(<target> [DEPLOY_DIR <dir>]
 						[PLUGINS <dir|file> [<dir|file> ...] ]
 						[FILES <dir|file> [<dir|file> ...] ]
 						[LIBS <dir|file> [<dir|file> ...] ]
+						[PACKAGE_SUFFIX <suffix>]
 						[OPTIONS <flag> ...]
 						[VERBOSE]
 						[DMG_NO_ZIP]
@@ -137,6 +138,7 @@ Examples:
  * "$<TARGET_FILE_NAME:myexe>" - right, relative item and TARGET_FILE_NAME is only filename
  * "/$<TARGET_FILE_NAME:myexe>" - wrong, absolute item with only filename
 
+PACKAGE_SUFFIX is additional text for package, after base name and before version
 
 This macro using "deploy_tool" from PIP,
 so make sure it can be executed from shell
@@ -169,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()
@@ -428,6 +430,7 @@ macro(deploy_target _T)
 	set(_FILE_FILES)
 	set(_LIBS_DIRS)
 	set(_LIBS_FILES)
+	set(_SUFFIX)
 	set(_VERB)
 	set(_WVERB 1> NUL)
 	set(_DEBUG_SUFFIX)
@@ -441,7 +444,7 @@ macro(deploy_target _T)
 	set(_DEB_SERVICE 0)
 	set(_MANIFEST 0)
 	set(_cur_arg)
-	set(__args "DESTINATION;DEPLOY_DIR;RESOURCES;PLUGINS;FILES;LIBS;OPTIONS;VERBOSE;DMG_NO_ZIP;DEB_USR_DIR;DEB_ADD_SERVICE;ADD_MANIFEST")
+	set(__args "PACKAGE_SUFFIX;DESTINATION;DEPLOY_DIR;RESOURCES;PLUGINS;FILES;LIBS;OPTIONS;VERBOSE;DMG_NO_ZIP;DEB_USR_DIR;DEB_ADD_SERVICE;ADD_MANIFEST")
 	foreach(_i ${ARGN})
 		if (_i IN_LIST __args)
 			set(_cur_arg "${_i}")
@@ -457,6 +460,9 @@ macro(deploy_target _T)
 			elseif("x${_cur_arg}" STREQUAL "xADD_MANIFEST")
 				set(_MANIFEST 1)
 			endif()
+		elseif ("x${_cur_arg}" STREQUAL "xPACKAGE_SUFFIX")
+			set(_cur_arg)
+			set(_SUFFIX "${_i}")
 		elseif ("x${_cur_arg}" STREQUAL "xDESTINATION")
 			set(_cur_arg)
 			set(_DESTINATION "${_i}/")
@@ -478,7 +484,7 @@ macro(deploy_target _T)
 	endforeach()
 	get_filename_component(_ICON_NAME "${${_T}_ICON}" NAME)
 	get_filename_component(_ICON_FN "${${_T}_ICON}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-	set(_TV "${_T}_${${_T}_VERSION}")
+	set(_TV "${_T}${_SUFFIX}_${${_T}_VERSION}")
 	set(_DEP_LIBPATH)
 	set(_DEP_LIBS_CS)
 	set(_DEP_LIBS)

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)