QAD and PIQt overall messages (as at recent PIP)

SDKMacros.cmake

@@ -52,6 +52,20 @@ macro(sdk_install _DIR IS_APP _TARGET _H_FILES _QM_FILES)
 endmacro()
 
 
+macro(copy_to_parent _inc_var)
+	set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
+	set(_qt_libs  ${_qt_libs}  PARENT_SCOPE)
+	set(_qt_apps  ${_qt_apps}  PARENT_SCOPE)
+	set(_qt_plugs ${_qt_plugs} PARENT_SCOPE)
+	if (NOT "x${_inc_var}" STREQUAL "x")
+		set(${_inc_var} ${${_inc_var}} PARENT_SCOPE)
+	endif()
+	if (LIB)
+		set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
+	endif()
+endmacro()
+
+
 macro(add_directories_with_include multilib_prefix)
 	set(DIRS)
 	file(GLOB _dl "[^.]*")
@@ -75,11 +89,7 @@ macro(add_directories_with_include multilib_prefix)
 		add_subdirectory(${_d})
 	endforeach()
 
-	set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
-	set(${inc_var} ${${inc_var}} PARENT_SCOPE)
-	if (LIB)
-		set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
-	endif()
+	copy_to_parent(${inc_var})
 endmacro()
 
 
@@ -92,8 +102,6 @@ macro(add_directories multilib_prefix)
 		endif()
 	endforeach()
 
-	if (LIB)
-		set(_ALL_TARGETS ${_ALL_TARGETS} PARENT_SCOPE)
-	endif()
+	copy_to_parent(${multilib_prefix}includes)
 endmacro()