From 730be4d8658781630200a8c47361d0fdc4002a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Thu, 5 Mar 2020 08:17:27 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@726
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 SDKMacros.cmake    | 13 ++++++-------
 qad/CMakeLists.txt | 10 ++++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/SDKMacros.cmake b/SDKMacros.cmake
index 1d48538..d5bb24e 100644
--- a/SDKMacros.cmake
+++ b/SDKMacros.cmake
@@ -3,29 +3,28 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES)
 	if(LIB)
 		if(WIN32)
 			if(NOT "x${_H_FILES}" STREQUAL "x")
-				#message("HFILES ${_H_FILES}")
 				install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR})
 			endif()
 			qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB})
 			qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
 			qt_install(TARGETS ${_TARGET} DESTINATION QtBin)
-			qt_install(FILES ${_QM_FILES} DESTINATION QtLang)
 		else()
 			if (NOT "x${_H_FILES}" STREQUAL "x")
 				install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${_DIR})
 			endif()
 			qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-			qt_install(FILES ${_QM_FILES} DESTINATION QtLang)
 		endif()
-		#message(STATUS "Install ${_TARGET} to system \"${CMAKE_INSTALL_PREFIX}\"")
+		if(NOT "x${_QM_FILES}" STREQUAL "x")
+			qt_install(FILES "${_QM_FILES}" DESTINATION QtLang)
+		endif()
 	else()
 		if(NOT "x${_H_FILES}" STREQUAL "x")
-			#message("HFILES ${_H_FILES}")
 			install(FILES ${_H_FILES} DESTINATION include/${_DIR})
 		endif()
 		qt_install(TARGETS ${_TARGET} DESTINATION bin)
 		qt_install(TARGETS ${_TARGET} DESTINATION lib)
-		qt_install(FILES ${_QM_FILES} DESTINATION lang)
-		#message(STATUS "Install ${_TARGET} to local \"bin\"")
+		if(NOT "x${_QM_FILES}" STREQUAL "x")
+			qt_install(FILES "${_QM_FILES}" DESTINATION lang)
+		endif()
 	endif()
 endmacro()
diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt
index 9f1fcae..2e0d883 100644
--- a/qad/CMakeLists.txt
+++ b/qad/CMakeLists.txt
@@ -63,32 +63,35 @@ if (LIB)
 endif()
 
 macro(qad_install _TARGET _H_FILES _QM_FILES)
-	#message("qad_install ${_TARGET} ${_QM_FILES}")
 	if (LIBPROJECT)
 		sdk_install("qad" "${_TARGET}" "${_H_FILES}" "${_QM_FILES}")
 	else()
 		if (LIB)
 			if (WIN32)
 				if(NOT "x${_H_FILES}" STREQUAL "x")
-					#message("HFILES ${_H_FILES}")
 					install(FILES ${_H_FILES} DESTINATION ${MINGW_INCLUDE}/${_DIR})
 				endif()
 				qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_LIB})
 				qt_install(TARGETS ${_TARGET} DESTINATION ${MINGW_BIN})
 				qt_install(TARGETS ${_TARGET} DESTINATION QtBin)
-				qt_install(FILES "${_QM_FILES}" DESTINATION QtLang)
 			else()
 				if(NOT "x${_H_FILES}" STREQUAL "x")
 					install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad)
 				endif()
 				qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 			endif()
+			if(NOT "x${_QM_FILES}" STREQUAL "x")
+				qt_install(FILES "${_QM_FILES}" DESTINATION QtLang)
+			endif()
 		else()
 			qt_install(TARGETS ${_TARGET} DESTINATION bin)
 			qt_install(TARGETS ${_TARGET} DESTINATION lib)
 			if(NOT "x${_H_FILES}" STREQUAL "x")
 				install(FILES ${_H_FILES} DESTINATION include/qad)
 			endif()
+			if(NOT "x${_QM_FILES}" STREQUAL "x")
+				qt_install(FILES "${_QM_FILES}" DESTINATION lang)
+			endif()
 		endif()
 	endif()
 endmacro()
@@ -98,7 +101,6 @@ macro(qad_plugin NAME _MODULES _LIBS)
 		if(DESIGNER_PLUGINS)
 			set(PROJ_NAME qad_${NAME}_plugin)
 			include_directories("..")
-			#message(${_${NAME}_PLUGIN_LIBS})
 			add_definitions(-DQT_PLUGIN)
 			add_definitions(-DQT_NO_DEBUG)
 			add_definitions(-DQT_SHARED)