fix get_system()

Reviewed-on: https://git.shs.tools/SHS/cmake/pulls/5

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*.{h,c,cpp}]
+charset = utf-8
+indent_style = tab
+tab_width = 4

CMakeLists.txt

@@ -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)

DeployMacros.cmake

@@ -6,6 +6,15 @@ in your top-level CMakeLists.txt
 
 
 
+get_system(OS ARCH)
+
+Set current operating system name to OS and
+target architecture to ARCH
+On Linux try to retrieve OS from "os-release" or "lsb-release"
+
+
+
+
 set_version(<target> [MAJOR <value>] [MINOR <value>] [REVISION <value>] [SUFFIX <value>] [BUILD <value>] [OUTPUT <file>])
 
 Set target version, optionally creates file
@@ -122,7 +131,7 @@ at cmake-time, so if entry ends with "/" it treat
 as directory, else - file
 
 FILES can be presents as cmake-generator-expressions. In this case
-entry treated as absolute path only if it prepened wiht "/".
+entry treated as absolute path only if it prepened with "/".
 Examples:
  * "/$<TARGET_FILE:myexe>" - right, TARGET_FILE is absolute path
  * "$<TARGET_FILE_NAME:myexe>" - right, relative item and TARGET_FILE_NAME is only filename
@@ -353,6 +362,55 @@ set(__gradle_sign
 # Help macros end
 
 
+macro(get_system _OS _ARCH)
+	if (NOT MY_ARCH)
+		target_architecture(MY_ARCH)
+	endif()
+	if ("x${CMAKE_SYSTEM_NAME}" STREQUAL "xLinux")
+		set(_os_id "")
+		set(_os_ver "")
+		set(_paths "/usr/lib" "/etc")
+		if (CMAKE_CROSSCOMPILING)
+			set(_paths "")
+			foreach (_c ${CMAKE_PREFIX_PATH})
+				list(APPEND _paths "${_c}/lib" "${_c}/../etc")
+			endforeach()
+		endif()
+		find_file(_release_file NAMES os-release lsb-release PATHS ${_paths} NO_DEFAULT_PATH)
+		if (_release_file)
+			file(STRINGS "${_release_file}" _lines)
+			foreach(_l ${_lines})
+				if ("${_l}" MATCHES "VERSION_ID=.*")
+					string(SUBSTRING "${_l}" 11 -1 _os_ver)
+					string(REPLACE "\"" "" _os_ver "${_os_ver}")
+					#message("VERSION_ID ${_os_ver}")
+				elseif ("${_l}" MATCHES "ID=.*")
+					string(SUBSTRING "${_l}" 3 -1 _os_id)
+					string(REPLACE "\"" "" _os_id "${_os_id}")
+					#message("ID ${_os_id}")
+				endif()
+			endforeach()
+			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}")
+	elseif(WIN32)
+		set(${_OS} "windows")
+		set(${_ARCH} "${MY_ARCH}")
+	elseif (APPLE)
+		set(${_OS} "macosx")
+		set(${_ARCH} "x64")
+	elseif (DEFINED ANDROID_PLATFORM)
+		set(${_OS} "android")
+		set(${_ARCH} "all")
+	endif()
+endmacro()
+
+
 macro(deploy_target _T)
 	set(_DESTINATION "${CMAKE_INSTALL_PREFIX}")
 	set(_DEPLOY_DIR "${CMAKE_INSTALL_PREFIX}")
@@ -372,7 +430,12 @@ macro(deploy_target _T)
 	set(_LIBS_FILES)
 	set(_VERB)
 	set(_WVERB 1> NUL)
+	set(_DEBUG_SUFFIX)
 	set(_OPTIONS "--strip;${CMAKE_STRIP}")
+	if (CMAKE_BUILD_TYPE MATCHES Debug)
+		list(APPEND _OPTIONS "--no-strip")
+		set(_DEBUG_SUFFIX "_debug")
+	endif()
 	set(_ZIP_DMG 1)
 	set(_DEB_OPT 1)
 	set(_DEB_SERVICE 0)
@@ -382,33 +445,33 @@ macro(deploy_target _T)
 	foreach(_i ${ARGN})
 		if (_i IN_LIST __args)
 			set(_cur_arg "${_i}")
-			if ("${_cur_arg}" STREQUAL "VERBOSE")
+			if ("x${_cur_arg}" STREQUAL "VERBOSE")
 				set(_VERB -v)
 				set(_WVERB)
-			elseif("${_cur_arg}" STREQUAL "DMG_NO_ZIP")
+			elseif("x${_cur_arg}" STREQUAL "xDMG_NO_ZIP")
 				set(_ZIP_DMG 0)
-			elseif("${_cur_arg}" STREQUAL "DEB_USR_DIR")
+			elseif("x${_cur_arg}" STREQUAL "xDEB_USR_DIR")
 				set(_DEB_OPT 0)
-			elseif("${_cur_arg}" STREQUAL "DEB_ADD_SERVICE")
+			elseif("x${_cur_arg}" STREQUAL "xDEB_ADD_SERVICE")
 				set(_DEB_SERVICE 1)
-			elseif("${_cur_arg}" STREQUAL "ADD_MANIFEST")
+			elseif("x${_cur_arg}" STREQUAL "xADD_MANIFEST")
 				set(_MANIFEST 1)
 			endif()
-		elseif ("${_cur_arg}" STREQUAL "DESTINATION")
+		elseif ("x${_cur_arg}" STREQUAL "xDESTINATION")
 			set(_cur_arg)
 			set(_DESTINATION "${_i}/")
-		elseif ("${_cur_arg}" STREQUAL "DEPLOY_DIR")
+		elseif ("x${_cur_arg}" STREQUAL "xDEPLOY_DIR")
 			set(_cur_arg)
 			set(_DEPLOY_DIR "${_i}/")
-		elseif ("${_cur_arg}" STREQUAL "RESOURCES")
+		elseif ("x${_cur_arg}" STREQUAL "xRESOURCES")
 			__add_file_or_dir(_RES_DIRS _RES_FILES "${_i}" "${_DEPLOY_DIR}")
-		elseif ("${_cur_arg}" STREQUAL "PLUGINS")
+		elseif ("x${_cur_arg}" STREQUAL "xPLUGINS")
 			__add_file_or_dir(_PLUG_DIRS _PLUG_FILES "${_i}" "${_DEPLOY_DIR}")
-		elseif ("${_cur_arg}" STREQUAL "FILES")
+		elseif ("x${_cur_arg}" STREQUAL "xFILES")
 			__add_file_or_dir(_FILE_DIRS _FILE_FILES "${_i}" "${_DEPLOY_DIR}")
-		elseif ("${_cur_arg}" STREQUAL "LIBS")
+		elseif ("x${_cur_arg}" STREQUAL "xLIBS")
 			__add_file_or_dir(_LIBS_DIRS _LIBS_FILES "${_i}" "${_DEPLOY_DIR}")
-		elseif ("${_cur_arg}" STREQUAL "OPTIONS")
+		elseif ("x${_cur_arg}" STREQUAL "xOPTIONS")
 			list(APPEND _OPTIONS "${_i}")
 		endif()
 		#message("-i = ${_i}")
@@ -436,47 +499,12 @@ macro(deploy_target _T)
 	set(_TARGET_BUILD "${${_T}_VERSION_BUILD}")
 	set(_TARGET_COMPANY "${${_T}_COMPANY}")
 	set(_TARGET_INFO "${${_T}_INFO}")
+	set(_TARGET_BUILDTYPE "${${_T}_BUILDTYPE}")
 	set(_TARGET_OS "???")
 	set(_TARGET_ARCH "???")
 	set(_TARGET_PACKAGE "???")
 	string(TIMESTAMP _TARGET_TIMESTAMP "%Y-%m-%d %H:%M:%S")
-	if ("x${CMAKE_SYSTEM_NAME}" STREQUAL "xLinux")
-		set(_os_id "")
-		set(_os_ver "")
-		set(_paths "/usr/lib" "/etc")
-		if (CMAKE_CROSSCOMPILING)
-			set(_paths "${CMAKE_PREFIX_PATH}/lib" "${CMAKE_PREFIX_PATH}/../etc")
-		endif()
-		find_file(_release_file NAMES os-release lsb-release PATHS ${_paths} NO_DEFAULT_PATH)
-		if (NOT "x${_release_file}" STREQUAL "x")
-			file(STRINGS "${_release_file}" _lines)
-			foreach(_l ${_lines})
-				if ("${_l}" MATCHES "VERSION_ID=.*")
-					string(SUBSTRING "${_l}" 11 -1 _os_ver)
-					string(REPLACE "\"" "" _os_ver "${_os_ver}")
-					#message("VERSION_ID ${_os_ver}")
-				elseif ("${_l}" MATCHES "ID=.*")
-					string(SUBSTRING "${_l}" 3 -1 _os_id)
-					string(REPLACE "\"" "" _os_id "${_os_id}")
-					#message("ID ${_os_id}")
-				endif()
-			endforeach()
-		endif()
-		string(TOLOWER "${_os_id}${_os_ver}" _TARGET_OS)
-		if ("x${_TARGET_OS}" STREQUAL "x")
-			set(_TARGET_OS "linux")
-		endif()
-		set(_TARGET_ARCH "${MY_ARCH}")
-	elseif(WIN32)
-		set(_TARGET_OS "windows")
-		set(_TARGET_ARCH "${MY_ARCH}")
-	elseif (APPLE)
-		set(_TARGET_OS "macosx")
-		set(_TARGET_ARCH "x64")
-	elseif (DEFINED ANDROID_PLATFORM)
-		set(_TARGET_OS "android")
-		set(_TARGET_ARCH "all")
-	endif()
+	get_system(_TARGET_OS _TARGET_ARCH)
 
 	if ("x${CMAKE_SYSTEM_NAME}" STREQUAL "xLinux")
 		set(_build "${${_T}_VERSION_BUILD}")
@@ -567,15 +595,23 @@ macro(deploy_target _T)
 		endif()
 		set(_dt_opts -l "${CMAKE_LDD}")
 		if (CMAKE_CROSSCOMPILING)
-			set(_dt_searchdirs "${CMAKE_PREFIX_PATH}/lib")
+			set(_dt_searchdirs "")
+			foreach (_c ${CMAKE_PREFIX_PATH})
+				set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${_c}/lib")
+			endforeach()
 			if (NOT "x${CMAKE_LIBRARY_ARCHITECTURE}" STREQUAL "x")
-				set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${CMAKE_PREFIX_PATH}/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-				set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${CMAKE_PREFIX_PATH}/../lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+				foreach (_c ${CMAKE_PREFIX_PATH})
+					set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${_c}/lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+					set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${_c}/../lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+				endforeach()
+			endif()
+			if (NOT "x${PIP_DEPLOY_LIBDIR}" STREQUAL "x")
+				set(_dt_searchdirs "${_dt_searchdirs}${_dt_delim}${PIP_DEPLOY_LIBDIR}")
 			endif()
 			set(_dt_opts -L "${CMAKE_READELF}" --dpkg-workdir "${CMAKE_DPKG_WORKDIR}" -s "${_dt_searchdirs}")
 		endif()
 		list(APPEND _dt_opts -q "${Qt${_Qt_}_ROOT}" --qt-conf-dir "${_bin_path}" --qt-plugins-dir "${_pli_path}" --rpath)
-		set(_deb_name "${_TV}_${_TARGET_OS}_${_DEB_ARCH}.deb")
+		set(_deb_name "${_TV}_${_TARGET_OS}_${_DEB_ARCH}${_DEBUG_SUFFIX}.deb")
 		set(_TARGET_PACKAGE "${_deb_name}")
 		#message("VER = \"${_DEBVERSION}\"")
 		#message("DEB = \"${_deb_name}\"")
@@ -642,7 +678,7 @@ macro(deploy_target _T)
 				set(_CMD_ ${_CMD_} COMMAND chmod 0755 ${_VERB} "${_AGD}/DEBIAN/${_f}")
 			endforeach()
 
-			set(_deb_name "${_TV}-service_${_TARGET_OS}_${_DEB_ARCH}.deb")
+			set(_deb_name "${_TV}-service_${_TARGET_OS}_${_DEB_ARCH}${_DEBUG_SUFFIX}.deb")
 			#message("VER = \"${_DEBVERSION}\"")
 			#message("DEB = \"${_deb_name}\"")
 			list(APPEND _CMD_ COMMAND echo "Package: ${_DEBNAME}-service" ${_C_echof})
@@ -688,13 +724,18 @@ macro(deploy_target _T)
 		__make_copy(_CMD_ _PLUG_DIRS _PLUG_FILES "${_AGD}")
 		__make_copy(_CMD_ _FILE_DIRS _FILE_FILES "${_AGD}")
 		__make_copy(_CMD_ _LIBS_DIRS _LIBS_FILES "${_AGD}")
-		set(_zip_name "${_TV}_${_TARGET_OS}_${_TARGET_ARCH}.zip")
+		set(_zip_name "${_TV}_${_TARGET_OS}_${_TARGET_ARCH}${_DEBUG_SUFFIX}.zip")
 		set(_TARGET_PACKAGE "${_zip_name}")
+		set(_search_path "")
+		foreach (_c ${CMAKE_PREFIX_PATH})
+			set(_search_path "${_search_path}${_dt_delim}${_c}/bin")
+		endforeach()
+		set(_search_path "${_search_path}${_dt_delim}${MINGW_BIN}${_add_search_path}${_dt_delim}${MINGW_LIB}")
 		add_custom_target(deploy_${_T}
 			# gather dir
 			${_CMD_}
 
-			COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -P windows,minimal -S windows -q "\"${Qt${_Qt_}_ROOT}\"" -s "\"${CMAKE_PREFIX_PATH}/bin${_dt_delim}${MINGW_BIN}${_add_search_path}${_dt_delim}${MINGW_LIB}\"" -o "${_AGD}" -p "${_AGD}" "\"${_AGD}$<TARGET_FILE_NAME:${_T}>\"" ${_ADD_DEPS}
+			COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -P windows,minimal -S windows -q "\"${Qt${_Qt_}_ROOT}\"" -s "\"${_search_path}\"" -o "${_AGD}" -p "${_AGD}" "\"${_AGD}$<TARGET_FILE_NAME:${_T}>\"" ${_ADD_DEPS}
 			# zip
 			COMMAND cd "\"${_DEPLOY_DIR}\"" "&&" zip -q -r "\"${_DESTINATION}/${_zip_name}\"" "\"${_TV}_win_${MY_ARCH}\""
 			COMMENT "Generating ${_zip_name}"
@@ -732,7 +773,7 @@ macro(deploy_target _T)
 		if (NOT CMAKE_PREFIX_PATH)
 			set(CMAKE_PREFIX_PATH "/usr/local")
 		endif()
-		set(_dmg_name "${_TV}_${_TARGET_OS}_${_TARGET_ARCH}.dmg")
+		set(_dmg_name "${_TV}_${_TARGET_OS}_${_TARGET_ARCH}${_DEBUG_SUFFIX}.dmg")
 		set(_TARGET_PACKAGE "${_dmg_name}")
 		set(_cmd_gen_dmg COMMAND genisoimage -quiet -V "${MACOSX_BUNDLE_BUNDLE_NAME}" -D -R -apple -no-pad -o "${_DESTINATION}/${_dmg_name}" "${_DMG}")
 		if (__mac_host)
@@ -744,6 +785,11 @@ macro(deploy_target _T)
 			set(_TARGET_PACKAGE "${_dmg_name}.zip")
 		endif()
 		set(_comment "Generating ${_TARGET_PACKAGE}")
+		set(_search_path "")
+		foreach (_c ${CMAKE_PREFIX_PATH})
+			set(_search_path "${_search_path}${_dt_delim}${_c}/lib")
+		endforeach()
+		set(_search_path "${_search_path}${_add_search_path}")
 		add_custom_target(deploy_${_T}
 			# gather .app dir
 			COMMAND mkdir ${_VERB} -p "${_res_path}"
@@ -751,7 +797,7 @@ macro(deploy_target _T)
 			COMMAND mkdir ${_VERB} -p "${_pli_path}"
 			COMMAND mkdir ${_VERB} -p "${_DESTINATION}"
 			${_CMD_}
-			COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -M "${CMAKE_OTOOL}" -P cocoa,minimal -S mac -q "${Qt5_ROOT}" --qt-conf-dir "${_res_path}" --qt-plugins-dir "${_pli_path}" -s "${CMAKE_PREFIX_PATH}/lib${_add_search_path}" -o "${_lib_path}" "${_bin_path}/${_T}" ${_ADD_DEPS}
+			COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -M "${CMAKE_OTOOL}" -P cocoa,minimal -S mac -q "${Qt5_ROOT}" --qt-conf-dir "${_res_path}" --qt-plugins-dir "${_pli_path}" -s "${_search_path}" -o "${_lib_path}" "${_bin_path}/${_T}" ${_ADD_DEPS}
 			# prepare dmg dir
 			COMMAND rm -rf "${_DMG}"
 			COMMAND mkdir ${_VERB} -p "${_DMG}"
@@ -891,7 +937,7 @@ macro(deploy_target _T)
 		set(_CMD_ ${_CMD_} COMMAND "${Qt${_Qt_}_BIN}/androiddeployqt" --aux-mode --android-platform ${ANDROID_PLATFORM} --output "\"${_AGD}\"" --input "\"${_out_json}\"")
 		set(_CMD_ ${_CMD_} COMMAND "${_AGD}/gradlew" ${_gradle_home} --no-daemon -p "\"${_AGD}\"" assembleDebug)
 		set(_CMD_ ${_CMD_} COMMAND "${_AGD}/gradlew" ${_gradle_home} --no-daemon -p "\"${_AGD}\"" bundleRelease)
-		set(_base_name "${_TV}_${_TARGET_OS}_${_TARGET_ARCH}")
+		set(_base_name "${_TV}_${_TARGET_OS}_${_TARGET_ARCH}${_DEBUG_SUFFIX}")
 		set(_TARGET_PACKAGE "${_base_name}.apk")
 		set(_CMD_ ${_CMD_} COMMAND "${CMAKE_COMMAND}" -E copy "${_AGD}/build/outputs/apk/debug/${_T}.android-debug.apk" "${_DESTINATION}/${_base_name}.apk")
 		if (ANDROID_STORE_FILE)

DeployTarget.manifest.in

@@ -7,5 +7,6 @@
 	"info": "${_TARGET_INFO}",
 	"system": "${_TARGET_OS}",
 	"arch": "${_TARGET_ARCH}",
+	"buildtype": "${_TARGET_BUILDTYPE}",
 	"timestamp": "${_TARGET_TIMESTAMP}"
 }

DeployVersionMacros.cmake

@@ -5,7 +5,7 @@ endif()
 if (POLICY CMP0053)
 	cmake_policy(SET CMP0053 NEW)
 endif()
-set(__prop_names "LABEL;FULLNAME;COMPANY;ICON;INFO")
+set(__prop_names "LABEL;FULLNAME;COMPANY;ICON;INFO;BUILDTYPE")
 list(APPEND __prop_names "ANDROID_TARGET_SDK;ANDROID_STORE_FILE;ANDROID_STORE_PASSWORD;ANDROID_KEY_PASSWORD;ANDROID_KEY_ALIAS;ANDROID_NEW_LOADER")
 set(__version_names "MAJOR;MINOR;REVISION;BUILD;SUFFIX")
 
@@ -16,7 +16,7 @@ endif()
 
 
 macro(set_version _T)
-	set(_VERSION_ 2) # macro version
+	set(_VERSION_ 3) # macro version
 	set(_name)
 	set(_is_name 1)
 	set(_is_out 0)
@@ -61,6 +61,7 @@ macro(set_version _T)
 	if ("x${${_T}_VERSION_BUILD}" STREQUAL "x")
 		set(${_T}_VERSION_BUILD "0")
 	endif()
+	set(${_T}_BUILDTYPE "${CMAKE_BUILD_TYPE}")
 	set(${_T}_VERSION "${${_T}_VERSION_MAJOR}.${${_T}_VERSION_MINOR}.${${_T}_VERSION_REVISION}${${_T}_VERSION_FULLSUFFIX}")
 	set(_${_T}_VERSION_WB "${${_T}_VERSION}-${${_T}_VERSION_BUILD}")
 	if (_out)
@@ -88,12 +89,12 @@ macro(set_version _T)
 
 // Project
 
-#define ${_TN}_VERSION_MAJOR    ${${_T}_VERSION_MAJOR}
-#define ${_TN}_VERSION_MINOR    ${${_T}_VERSION_MINOR}
-#define ${_TN}_VERSION_REVISION ${${_T}_VERSION_REVISION}
-#define ${_TN}_VERSION_BUILD    ${${_T}_VERSION_BUILD}
-#define ${_TN}_VERSION_SUFFIX   \"${${_T}_VERSION_SUFFIX}\"
-#define ${_TN}_VERSION_NAME     \"${${_T}_VERSION}\"
+#define ${_TN}_VERSION_MAJOR     ${${_T}_VERSION_MAJOR}
+#define ${_TN}_VERSION_MINOR     ${${_T}_VERSION_MINOR}
+#define ${_TN}_VERSION_REVISION  ${${_T}_VERSION_REVISION}
+#define ${_TN}_VERSION_BUILD     ${${_T}_VERSION_BUILD}
+#define ${_TN}_VERSION_SUFFIX    \"${${_T}_VERSION_SUFFIX}\"
+#define ${_TN}_VERSION_NAME      \"${${_T}_VERSION}\"
 #define ${_TN}_MAKE_VERSION(major, minor, revision)  ((major << 16) | (minor << 8) | revision)
 #define ${_TN}_VERSION  ${_TN}_MAKE_VERSION(${_TN}_VERSION_MAJOR, ${_TN}_VERSION_MINOR, ${_TN}_VERSION_REVISION)
 
@@ -103,6 +104,7 @@ macro(set_version _T)
 #define ${_TN}_CMAKE_VERSION    \"${CMAKE_VERSION}\"
 #define ${_TN}_CXX_COMPILER     \"${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}\"
 #define ${_TN}_BUILD_DATE       \"${_cur_date}\"
+#define ${_TN}_BUILD_TYPE       \"${${_T}_BUILDTYPE}\"
 #define ${_TN}_ARCH             \"${MY_ARCH}\"
 
 
@@ -123,7 +125,7 @@ endmacro()
 
 macro(import_version _T _F)
 	if (NOT "x${_T}" STREQUAL "x${_F}")
-		set(_names "${__version_names};FULLSUFFIX")
+		set(_names "${__version_names};FULLSUFFIX;BUILDTYPE")
 		foreach(_i ${_names})
 			set(${_T}_VERSION_${_i} "${${_F}_VERSION_${_i}}")
 		endforeach()
@@ -160,6 +162,7 @@ macro(set_deploy_property _T)
 			set(${_T}_${_name} ${_i})
 		endif()
 	endforeach()
+	set(${_T}_BUILDTYPE "${CMAKE_BUILD_TYPE}")
 endmacro()
 
 

DownloadGTest.cmake

@@ -1,31 +0,0 @@
-# Download and unpack googletest at configure time
-configure_file(GTestCMakeLists.txt.in googletest-download/CMakeLists.txt)
-execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-	RESULT_VARIABLE result
-	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
-if(result)
-	message(FATAL_ERROR "CMake step for googletest failed: ${result}")
-endif()
-execute_process(COMMAND ${CMAKE_COMMAND} --build .
-	RESULT_VARIABLE result
-	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
-if(result)
-	message(FATAL_ERROR "Build step for googletest failed: ${result}")
-endif()
-
-# Prevent overriding the parent project's compiler/linker
-# settings on Windows
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
-# Add googletest directly to our build. This defines
-# the gtest and gtest_main targets.
-add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
-	${CMAKE_CURRENT_BINARY_DIR}/googletest-build
-	EXCLUDE_FROM_ALL)
-
-# The gtest/gtest_main targets carry header search path
-# dependencies automatically when using CMake 2.8.11 or
-# later. Otherwise we have to add them here ourselves.
-if (CMAKE_VERSION VERSION_LESS 2.8.11)
-	include_directories("${gtest_SOURCE_DIR}/include")
-endif()

FindMinGW.cmake

@@ -15,6 +15,7 @@ if(${MINGW})
 		find_library(_mingw_lib_m m HINTS ${MINGW_BIN}/../lib ${MINGW_INCLUDE}/../lib)
 		get_filename_component(_mingw_lib ${_mingw_lib_m} PATH)
 		set(MINGW_LIB "${_mingw_lib}" CACHE PATH "" FORCE)
+		list(APPEND CMAKE_LIBRARY_PATH "${MINGW_LIB}")
 		if (NOT _MGW_MSG)
 			set(_MGW_MSG 1 CACHE BOOL "msg_mingw" FORCE)
 			message(STATUS "Found MinGW binary path = ${MINGW_BIN}")

SHSTKMacros.cmake

@@ -2,21 +2,21 @@
 
 shstk_define_option(name desc)
 
-shstk_begin_project(domain module)
+shstk_begin_project(name)
 
 shstk_install(dir is_app target h_files)
 
 shstk_is_parent_exists(out)
 
-shstk_copy_to_parent(domain)
+shstk_copy_to_parent()
 
-shstk_add_directories(domain)
+shstk_add_directories()
 
-shstk_add_directories_with_include(is_qt domain)
+shstk_add_directories_with_include(is_qt name)
 
-shstk_set_find_dirs(domain module)
+shstk_set_find_dirs(name)
 
-shstk_find_header(module filename add_find_info)
+shstk_find_header(name filename add_find_info)
 
 align_list(list out)
 
@@ -38,7 +38,9 @@ macro(shstk_define_option name desc)
 endmacro()
 
 
-macro(shstk_begin_project domain module)
+macro(shstk_begin_project name)
+	string(TOLOWER "${name}" ${name}_lowercase)
+	string(TOUPPER "${name}" ${name}_uppercase)
 	set(INSTALL_PREFIX)
 	set(_plugins_default_ 1)
 	if (CMAKE_CROSSCOMPILING)
@@ -118,45 +120,38 @@ macro(shstk_begin_project domain module)
 	set(_qt_libs )
 	set(_qt_apps )
 	set(_qt_plugs)
-	if (NOT "x${domain}" STREQUAL "x")
-		set(BUILDING_${domain} ON CACHE BOOL "build ${domain}")
-		set(${domain}_ROOT_SRC "${CMAKE_CURRENT_SOURCE_DIR}" CACHE STRING "")
-		set(${domain}_ROOT_BIN "${CMAKE_CURRENT_BINARY_DIR}" CACHE STRING "")
-		set(SET_TARGETS_${domain} OFF CACHE BOOL "" FORCE)
+	if (NOT "x${name}" STREQUAL "x")
+		set(BUILDING_${name} ON CACHE BOOL "build ${name}")
+		set(${name}_ROOT_SRC "${CMAKE_CURRENT_SOURCE_DIR}" CACHE STRING "")
+		set(${name}_ROOT_BIN "${CMAKE_CURRENT_BINARY_DIR}" CACHE STRING "")
+		set(SET_TARGETS_${name} OFF CACHE BOOL "" FORCE)
 
 		if(STATIC_LIB)
-			add_definitions(-D${module}_STATIC_DEFINE)
-			set(${domain}_LIB_TYPE STATIC)
-			set(${domain}_LIB_TYPE_MSG "Static")
+			add_definitions(-D${${name}_uppercase}_STATIC_DEFINE)
+			set(${name}_LIB_TYPE STATIC)
+			set(${name}_LIB_TYPE_MSG "Static")
 		else()
-			set(${domain}_LIB_TYPE SHARED)
-			set(${domain}_LIB_TYPE_MSG "Shared")
+			set(${name}_LIB_TYPE SHARED)
+			set(${name}_LIB_TYPE_MSG "Shared")
 		endif()
 
 		if (CMAKE_BUILD_TYPE MATCHES Debug)
-			set(${domain}_BUILD_TYPE "Debug")
-			#add_definitions(-DPIP_DEBUG)
+			set(${name}_BUILD_TYPE "Debug")
 		else()
-			set(${domain}_BUILD_TYPE "Release")
+			set(${name}_BUILD_TYPE "Release")
 		endif()
 
-		#set(${domain}_MAJOR    1)
-		#set(${domain}_MINOR    8)
-		#set(${domain}_REVISION 0)
-		#set(${domain}_SUFFIX   )
-		#set(${domain}_COMPANY  SHS)
-		#set(${domain}_DOMAIN   org.SHS)
-		set(${domain}_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/${domain}_version.h")
-		set_version(${domain}
-			MAJOR    "${${domain}_MAJOR}"
-			MINOR    "${${domain}_MINOR}"
-			REVISION "${${domain}_REVISION}"
+		set(${name}_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/${${name}_lowercase}_version.h")
+		set_version(${name}
+			MAJOR    "${${name}_MAJOR}"
+			MINOR    "${${name}_MINOR}"
+			REVISION "${${name}_REVISION}"
 			BUILD    "${BUILD_NUMBER}"
-			SUFFIX   "${${domain}_SUFFIX}"
-			OUTPUT   "${${domain}_VERSION_FILE}")
-		set_deploy_property(${domain} ${${domain}_LIB_TYPE}
-			FULLNAME "${${domain}_DOMAIN}.*"
-			COMPANY  "${${domain}_COMPANY}")
+			SUFFIX   "${${name}_SUFFIX}"
+			OUTPUT   "${${name}_VERSION_FILE}")
+		set_deploy_property(${name} ${${name}_LIB_TYPE}
+			FULLNAME "${${name}_DOMAIN}.*"
+			COMPANY  "${${name}_COMPANY}")
 
 	endif()
 
@@ -227,7 +222,7 @@ macro(shstk_copy_to_parent)
 endmacro()
 
 
-macro(shstk_add_directories domain)
+macro(shstk_add_directories)
 	file(GLOB _dl "[^.]*")
 	foreach(_d ${_dl})
 		if(IS_DIRECTORY ${_d})
@@ -238,7 +233,7 @@ macro(shstk_add_directories domain)
 endmacro()
 
 
-macro(shstk_add_directories_with_include is_qt domain)
+macro(shstk_add_directories_with_include is_qt name)
 	set(DIRS)
 	file(GLOB _dl "[^.]*")
 	foreach(_d ${_dl})
@@ -250,7 +245,7 @@ macro(shstk_add_directories_with_include is_qt domain)
 	foreach(_d ${DIRS})
 		get_filename_component(_dname "${_d}" NAME)
 		if (${is_qt})
-			list(APPEND QT_MULTILIB_LIST ${domain}${_dname})
+			list(APPEND QT_MULTILIB_LIST ${name}${_dname})
 			#set(QT_MULTILIB_LIST "${QT_MULTILIB_LIST}" CACHE STRING "")
 		endif()
 	endforeach()
@@ -263,40 +258,35 @@ macro(shstk_add_directories_with_include is_qt domain)
 endmacro()
 
 
-macro(shstk_set_find_dirs domain module)
-	#set(_PIP_INCDIR "${PIP_DIR}/include/pip")
-	#set(_PIP_LIBDIR "${PIP_DIR}/lib")
-	set(${domain}_INCDIR)
-	set(${domain}_LIBDIR)
-	set(${domain}_BINDIR)
-	set(${domain}_FIND_PROGRAM_ARG)
-	set(${domain}_BINEXT "")
-	#if (BUILDING_${domain})
-	#	list(APPEND ${domain}_INCDIR "${${domain}_ROOT_SRC}")
-	#	list(APPEND ${domain}_LIBDIR "${${domain}_ROOT_BIN}")
-	#endif()
-	if(DEFINED ${module}_DIR)
-		list(APPEND ${domain}_LIBDIR "${${module}_DIR}/lib")
-		list(APPEND ${domain}_INCDIR "${${module}_DIR}/include/${domain}")
-		list(APPEND ${domain}_BINDIR "${${module}_DIR}/bin")
+macro(shstk_set_find_dirs name)
+	string(TOLOWER "${name}" ${name}_lowercase)
+	set(${name}_INCDIR)
+	set(${name}_LIBDIR)
+	set(${name}_BINDIR)
+	set(${name}_FIND_PROGRAM_ARG)
+	set(${name}_BINEXT "")
+	if(DEFINED ${name}_DIR)
+		list(APPEND ${name}_LIBDIR "${${name}_DIR}/lib")
+		list(APPEND ${name}_INCDIR "${${name}_DIR}/include/${${name}_lowercase}")
+		list(APPEND ${name}_BINDIR "${${name}_DIR}/bin")
 	endif()
 	if(MINGW_INCLUDE)
-		list(APPEND ${domain}_INCDIR "${MINGW_INCLUDE}/${domain}")
-		list(APPEND ${domain}_LIBDIR "${MINGW_LIB}")
-		list(APPEND ${domain}_BINDIR "${MINGW_BIN}")
+		list(APPEND ${name}_INCDIR "${MINGW_INCLUDE}/${${name}_lowercase}")
+		list(APPEND ${name}_LIBDIR "${MINGW_LIB}")
+		list(APPEND ${name}_BINDIR "${MINGW_BIN}")
 	endif()
 	if(CMAKE_CROSSCOMPILING)
-		list(APPEND ${domain}_INCDIR "${CMAKE_PREFIX_PATH}/include/${domain}")
-		list(APPEND ${domain}_LIBDIR "${CMAKE_PREFIX_PATH}/lib")
-		set(${domain}_FIND_PROGRAM_ARG "NO_DEFAULT_PATH")
-		list(APPEND ${domain}_BINDIR "/usr/bin" "/usr/local/bin")
+		list(APPEND ${name}_INCDIR "${CMAKE_PREFIX_PATH}/include/${${name}_lowercase}")
+		list(APPEND ${name}_LIBDIR "${CMAKE_PREFIX_PATH}/lib")
+		set(${name}_FIND_PROGRAM_ARG "NO_DEFAULT_PATH")
+		list(APPEND ${name}_BINDIR "/usr/bin" "/usr/local/bin")
 		include_directories(${CMAKE_PREFIX_PATH}/include)
 		link_directories(${CMAKE_PREFIX_PATH}/lib)
 	else()
-		list(APPEND ${domain}_BINDIR "${CMAKE_PREFIX_PATH}/bin")
+		list(APPEND ${name}_BINDIR "${CMAKE_PREFIX_PATH}/bin")
 		if(NOT WIN32)
-			list(APPEND ${domain}_INCDIR "/usr/include/${domain}" "/usr/local/include/${domain}")
-			list(APPEND ${domain}_LIBDIR "/usr/lib" "/usr/local/lib")
+			list(APPEND ${name}_INCDIR "/usr/include/${${name}_lowercase}" "/usr/local/include/${${name}_lowercase}")
+			list(APPEND ${name}_LIBDIR "/usr/lib" "/usr/local/lib")
 		endif()
 		if(APPLE)
 			include_directories(/usr/local/include)
@@ -304,51 +294,48 @@ macro(shstk_set_find_dirs domain module)
 		endif()
 	endif()
 	if ("x${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "xWindows")
-		set(${domain}_BINEXT ".exe")
+		set(${name}_BINEXT ".exe")
 		if (CMAKE_CROSSCOMPILING)
-			set(${domain}_FIND_PROGRAM_ARG)
+			set(${name}_FIND_PROGRAM_ARG)
 		endif()
 	endif()
-	#list(APPEND ${domain}_BINDIR "${PIP_DIR}/bin")
 endmacro()
 
 
-macro(shstk_find_header domain module filename add_find_info)
-	if(NOT ${module}_VERSION)
-		find_file(${domain}_H_INCLUDE "${filename}" HINTS ${${domain}_INCDIR})
-		#message("${domain}_H_INCLUDE \"${filename}\" HINTS \"${${domain}_INCDIR}\" = \"${${domain}_H_INCLUDE}\"")
-		if (NOT ${domain}_H_INCLUDE)
-			message(FATAL_ERROR "Can`t find ${module} version file (\"${filename}\")!")
+macro(shstk_find_header name filename add_find_info)
+	string(TOUPPER "${name}" ${name}_uppercase)
+	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})
+		#message("${name}_H_INCLUDE \"${filename}\" HINTS \"${${name}_INCDIR}\" = \"${${name}_H_INCLUDE}\"")
+		if (NOT ${name}_H_INCLUDE)
+			message(FATAL_ERROR "Can`t find ${name} version file (\"${filename}\")!")
 		endif()
-		#if (DEFINED ANDROID_PLATFORM)
-		#	set(CD_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/${domain})
-		#else()
-			get_filename_component(_inc ${${domain}_H_INCLUDE} PATH)
-		set(${domain}_INCLUDES "${_inc}" CACHE STRING "")
-		#endif()
+		get_filename_component(_inc ${${name}_H_INCLUDE} PATH)
+		set(${name}_INCLUDES "${_inc}" CACHE STRING "")
 		include(CheckSymbolExists)
-		check_symbol_exists(${module}_VERSION_NAME "${${domain}_H_INCLUDE}" _${domain}_version_found)
-		if (_${domain}_version_found)
-			file(STRINGS "${${domain}_H_INCLUDE}" _version REGEX "^[ \t]*#define[ \t]+${module}_VERSION_NAME+[ \t]+.*$")
+		check_symbol_exists(${${name}_uppercase}_VERSION_NAME "${${name}_H_INCLUDE}" _${name}_version_found)
+		if (_${name}_version_found)
+			file(STRINGS "${${name}_H_INCLUDE}" _version REGEX "^[ \t]*#define[ \t]+${${name}_uppercase}_VERSION_NAME+[ \t]+.*$")
 			string(REGEX MATCH "\".*\"" _version ${_version})
 			string(LENGTH ${_version} SL)
 			math(EXPR SL ${SL}-2)
 			string(SUBSTRING ${_version} 1 ${SL} _version)
-			set(${module}_VERSION ${_version} CACHE STRING "${module}_VERSION")
-			if (NOT _FIND_${module}_MSG)
-				set(_FIND_${module}_MSG 1 CACHE BOOL "find_msg_${module}" FORCE)
+			set(${name}_VERSION ${_version} CACHE STRING "${name}_VERSION")
+			if (NOT _FIND_${name}_MSG)
+				set(_FIND_${name}_MSG 1 CACHE BOOL "find_msg_${name}" FORCE)
 				set(_afi)
 				if (NOT "x${add_find_info}" STREQUAL "x")
 					set(_afi ": ${add_find_info}")
 				endif()
-				message(STATUS "Found ${module}${_afi} (version \"${${module}_VERSION}\")")
+				message(STATUS "Found ${name}${_afi} (version \"${${name}_VERSION}\")")
 			endif()
 		else()
-			message(FATAL_ERROR "Can`t find ${module}_VERSION_NAME in \"${filename}\"!")
+			message(FATAL_ERROR "Can`t find ${${name}_uppercase}_VERSION_NAME in \"${filename}\"!")
 		endif()
 	endif()
-	if(${module}_FIND_VERSION VERSION_GREATER ${module}_VERSION)
-		message(FATAL_ERROR "${module} version ${${module}_VERSION} is available, but ${${module}_FIND_VERSION} requested!")
+	if(${name}_FIND_VERSION VERSION_GREATER ${name}_VERSION)
+		message(FATAL_ERROR "${name} version ${${name}_VERSION} is available, but ${${${name}_uppercase}_FIND_VERSION} requested!")
 	endif()
 endmacro()
 

SHSTKQtMacros.cmake

@@ -4,7 +4,7 @@ shstk_qad_install(dir is_app target h_files qm_files)
 
 shstk_qad_plugin(name modules libs)
 
-shstk_qad_project(name is_app domain modules libs)
+shstk_qad_project(name is_app root_name modules libs)
 
 ]]
 
@@ -101,6 +101,11 @@ macro(shstk_qad_plugin NAME _MODULES _LIBS)
 			qad_wrap(${SRC} CPPS out_CPP QMS out_QM)
 			qad_add_library(${PROJ_NAME} SHARED out_CPP)
 			qad_target_link_libraries(${PROJ_NAME} ${_LIBS} ${_${NAME}_PLUGIN_LIBS})
+			foreach(_v ${_QT_VERSIONS_})
+				if (LOCAL_FOUND${_v})
+					target_include_directories(${PROJ_NAME}${TARGET_SUFFIX_Qt${_v}} PRIVATE "${Qt${_v}Designer_PRIVATE_INCLUDE_DIRS}")
+				endif()
+			endforeach()
 			if (WIN32)
 				qad_install(TARGETS ${PROJ_NAME} RUNTIME DESTINATION QtPlugins/designer)
 			else()
@@ -113,44 +118,44 @@ macro(shstk_qad_plugin NAME _MODULES _LIBS)
 endmacro()
 
 
-macro(shstk_qad_project NAME IS_APP DOMAIN _MODULES _LIBS)
+macro(shstk_qad_project NAME IS_APP ROOT_NAME _MODULES _LIBS)
 	project(${NAME})
 	#message("qad_find_qt ${NAME} ${IS_APP} \"${QtVersions}\" \"${_MODULES}\"")
 	qad_find_qt(${QtVersions} Core ${_MODULES})
 	qad_sources(SRC)
-	import_version(${PROJECT_NAME} ${DOMAIN})
-	import_deploy_properties(${PROJECT_NAME} ${DOMAIN})
+	import_version(${PROJECT_NAME} ${ROOT_NAME})
+	import_deploy_properties(${PROJECT_NAME} ${ROOT_NAME})
 	if (${IS_APP})
 		list(APPEND _qt_apps ${PROJECT_NAME})
 		set_deploy_property(${PROJECT_NAME}
 			LABEL 		${PROJECT_NAME}
-			FULLNAME 	"${${DOMAIN}_DOMAIN}.${PROJECT_NAME}"
+			FULLNAME 	"${${ROOT_NAME}_DOMAIN}.${PROJECT_NAME}"
 			INFO 		"${APP_INFO}"
 			ICON 		"${APP_ICON}")
 	else()
 		list(APPEND _qt_libs ${PROJECT_NAME})
 		set_deploy_property(${PROJECT_NAME} SHARED
 			LABEL 		${PROJECT_NAME}
-			FULLNAME 	"${${DOMAIN}_DOMAIN}.${PROJECT_NAME}"
-			INFO 		"${DOMAIN} ${NAME} library")
+			FULLNAME 	"${${ROOT_NAME}_DOMAIN}.${PROJECT_NAME}"
+			INFO 		"${ROOT_NAME} ${NAME} library")
 	endif()
 	make_rc(${PROJECT_NAME} out_RC)
 	qad_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM ${out_RC})
-	#message("add_exe proj ${NAME}, ${${DOMAIN}_DOMAIN}.${PROJECT_NAME}")
+	#message("add_exe proj ${NAME}, ${${ROOT_NAME}_DOMAIN}.${PROJECT_NAME}")
 	if (${IS_APP})
 		set(_DEBUG_FLAG_)
 		if (NOT CMAKE_BUILD_TYPE MATCHES Debug)
 			set(_DEBUG_FLAG_ "WIN32")
 		endif()
-		qad_add_executable(${PROJECT_NAME} ${_DEBUG_FLAG_} out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN})
+		qad_add_executable(${PROJECT_NAME} ${_DEBUG_FLAG_} out_CPP ${${ROOT_NAME}_EXPORT_HEADER} ${ARGN})
 	else()
 		set(_libtype SHARED)
-		if (NOT "x${${DOMAIN}_LIB_TYPE}" STREQUAL "x")
-			set(_libtype ${${DOMAIN}_LIB_TYPE})
+		if (NOT "x${${ROOT_NAME}_LIB_TYPE}" STREQUAL "x")
+			set(_libtype ${${ROOT_NAME}_LIB_TYPE})
 		endif()
-		qad_add_library(${PROJECT_NAME} ${_libtype} out_CPP ${${DOMAIN}_EXPORT_HEADER} ${ARGN})
-		#if(NOT ${DOMAIN}_STATIC_LIB)
-		#	qad_target_compile_definitions(${PROJECT_NAME} PRIVATE ${DOMAIN}_SHARED_DEFINE)
+		qad_add_library(${PROJECT_NAME} ${_libtype} out_CPP ${${ROOT_NAME}_EXPORT_HEADER} ${ARGN})
+		#if(NOT ${ROOT_NAME}_STATIC_LIB)
+		#	qad_target_compile_definitions(${PROJECT_NAME} PRIVATE ${ROOT_NAME}_SHARED_DEFINE)
 		#endif()
 		qad_generate_export_header(${PROJECT_NAME})
 		list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h")