git-svn-id: svn://db.shs.com.ru/libs@468 a8b55f48-bf90-11e4-a774-851b48703e85

qad/QtWraps.cmake

@@ -296,6 +296,7 @@ macro(qt_wrap)
 				qt4_wrap_ui(CUIS${_v} ${UI_LIST})
 				qt4_add_resources(CRES${_v} ${RES_LIST})
 				if (WAS_QM_ARG)
+					set(${QM${_v}_VAR} "")
 					qt4_add_translation(${QM${_v}_VAR} ${TS_LIST})
 				endif()
 			else()
@@ -304,6 +305,7 @@ macro(qt_wrap)
 					qt5_wrap_ui(CUIS${_v} ${UI_LIST})
 					qt5_add_resources(CRES${_v} ${RES_LIST})
 					if (WAS_QM_ARG)
+						set(${QM${_v}_VAR} "")
 						qt5_add_translation(${QM${_v}_VAR} ${TS_LIST})
 					endif()
 				else()
@@ -442,6 +444,7 @@ macro(qt_install)
 			set(_IS_FILES 0)
 			set(_IS_DEST 0)
 			set(_IS_LANG 0)
+			set(_INVALID 0)
 			foreach(_i ${ARGN})
 				if ("x${_i}" STREQUAL "xQtLang")
 					set(_IS_LANG 1)
@@ -460,7 +463,8 @@ macro(qt_install)
 						set(_IS_FILES 0)
 						if (_IS_LANG)
 							if (("x${${_i}_Qt${_v}}" STREQUAL "x") OR ("x${_i}" STREQUAL "xDESTINATION"))
-								return()
+								#return()
+								set(_INVALID 1)
 							else()
 								set(_INST_LIST ${_INST_LIST} ${${_i}_Qt${_v}})
 							endif()
@@ -503,10 +507,12 @@ macro(qt_install)
 					endif()
 				endif()
 			endforeach()
-			if (NOT ("x${_prev_inst}" STREQUAL "x${_INST_LIST}"))
-				#message("install: ${_INST_LIST}")
-				install(${_INST_LIST})
-				set(_prev_inst "${_INST_LIST}")
+			if (NOT _INVALID)
+				if (NOT ("x${_prev_inst}" STREQUAL "x${_INST_LIST}"))
+					#message("install: ${_INST_LIST}")
+					install(${_INST_LIST})
+					set(_prev_inst "${_INST_LIST}")
+				endif()
 			endif()
 		endif()
 	endforeach()