From 0255151d68d78b6fa41b771232b094e1cb1d0d7e Mon Sep 17 00:00:00 2001
From: Ivan Pelipenko <peri4ko@yandex.ru>
Date: Sun, 6 Sep 2020 21:45:51 +0300
Subject: [PATCH] Windows works

---
 SHSTKMacros.cmake   | 8 +++++---
 SHSTKQtMacros.cmake | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/SHSTKMacros.cmake b/SHSTKMacros.cmake
index 2ab0b74..42bec61 100644
--- a/SHSTKMacros.cmake
+++ b/SHSTKMacros.cmake
@@ -308,18 +308,20 @@ 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}\")!")
 		endif()
 		#if (DEFINED ANDROID_PLATFORM)
 		#	set(CD_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/${domain})
 		#else()
-			get_filename_component(${domain}_INCLUDES ${${domain}_H_INCLUDE} PATH)
+			get_filename_component(_inc ${${domain}_H_INCLUDE} PATH)
+		set(${domain}_INCLUDES "${_inc}" CACHE STRING "")
 		#endif()
 		include(CheckSymbolExists)
-		check_symbol_exists(${module}_VERSION_NAME "${${domain}_INCLUDES}/${filename}" _version_found)
+		check_symbol_exists(${module}_VERSION_NAME "${${domain}_H_INCLUDE}" _version_found)
 		if (_version_found)
-			file(STRINGS "${${domain}_INCLUDES}/${filename}" _version REGEX "^[ \t]*#define[ \t]+${module}_VERSION_NAME+[ \t]+.*$")
+			file(STRINGS "${${domain}_H_INCLUDE}" _version REGEX "^[ \t]*#define[ \t]+${module}_VERSION_NAME+[ \t]+.*$")
 			string(REGEX MATCH "\".*\"" _version ${_version})
 			string(LENGTH ${_version} SL)
 			math(EXPR SL ${SL}-2)
diff --git a/SHSTKQtMacros.cmake b/SHSTKQtMacros.cmake
index 0a5c435..edc7924 100644
--- a/SHSTKQtMacros.cmake
+++ b/SHSTKQtMacros.cmake
@@ -154,6 +154,8 @@ macro(shstk_qt_project NAME IS_APP DOMAIN _MODULES _LIBS)
 		#set(QT_MULTILIB_LIST "${QT_MULTILIB_LIST}" CACHE STRING "")
 	endif()
 	qt_target_link_libraries(${PROJECT_NAME} ${_LIBS})
+	file(GLOB_RECURSE PHS  "*_p.h")
+	list(REMOVE_ITEM out_HDR "${PHS}")
 	#message(STATUS "Building ${PROJECT_NAME}")
 	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
 		set(_${NAME}_PLUGIN_LIBS "${_LIBS}")