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

qad/cmake/QtWraps.cmake

@@ -212,7 +212,6 @@ macro(find_qt)
 			endif()
 		endif()
 	endif()
-#	set()
 	foreach(_v ${_QT_VERSIONS_})
 		if (LOCAL_FOUND${_v})
 			foreach(_p ${Qt${_v}_INCLUDES})
@@ -238,17 +237,13 @@ macro(qt_sources OUT)
 		if     (_IS_DIR)
 			set(_DIR "${_i}")
 			set(_IS_DIR 0)
-		else()
+		elseif ("x${_i}" STREQUAL "xDIR")
-			if ("x${_i}" STREQUAL "xDIR")
 			set(_IS_DIR 1)
-			else()
+		elseif ("x${_i}" STREQUAL "xNO_DEFAULT")
-				if ("x${_i}" STREQUAL "xNO_DEFAULT")
 			set(_NO_DEFAULT 1)
 		else()
 			list(APPEND _REGEXP ${_i})
 		endif()
-			endif()
-		endif()
 	endforeach()
 	if (NOT "x${_DIR}" STREQUAL "x")
 		#file(TO_CMAKE_PATH "${_DIR}//" _DIR)
@@ -282,33 +277,23 @@ macro(qt_wrap)
 			set(HDR_VAR ${_i})
 			set(WAS_HDR_ARG 1)
 			set(_HDR_ARG 0)
-		else()
+		elseif (_CPP_ARG)
-			if (_CPP_ARG)
 			set(CPP_VAR ${_i})
 			set(WAS_CPP_ARG 1)
 			set(_CPP_ARG 0)
-			else()
+		elseif (_QM_ARG)
-				if (_QM_ARG)
 			set(QM_VAR ${_i})
 			set(WAS_QM_ARG 1)
 			set(_QM_ARG 0)
-				else()
+		elseif ("x${_i}" STREQUAL "xHDRS")
-					if ("x${_i}" STREQUAL "xHDRS")
 			set(_HDR_ARG 1)
-					else()
+		elseif ("x${_i}" STREQUAL "xCPPS")
-						if ("x${_i}" STREQUAL "xCPPS")
 			set(_CPP_ARG 1)
-						else()
+		elseif ("x${_i}" STREQUAL "xQMS")
-							if ("x${_i}" STREQUAL "xQMS")
 			set(_QM_ARG 1)
 		else()
 			list(APPEND FILE_LIST "${_i}")
 		endif()
-						endif()
-					endif()
-				endif()
-			endif()
-		endif()
 	endforeach()
 	foreach(_v ${_QT_VERSIONS_})
 		set(CPP${_v}_VAR)
@@ -382,8 +367,7 @@ macro(qt_wrap)
 					set(${QM${_v}_VAR} "")
 					qt4_add_translation(${QM${_v}_VAR} ${TS_LIST})
 				endif()
-			else()
+			elseif (${_v} EQUAL 5)
-				if (${_v} EQUAL 5)
 				qt5_wrap_cpp(MOCS${_v} ${H_LIST} OPTIONS -nw ${MOC_INC_Qt5})
 				qt5_wrap_ui(CUIS${_v} ${UI_LIST})
 				qt5_add_resources(CRES${_v} ${RES_LIST})
@@ -392,7 +376,7 @@ macro(qt_wrap)
 					qt5_add_translation(${QM${_v}_VAR} ${TS_LIST})
 				endif()
 			else()
-				endif()
+				# Qt6 ...
 			endif()
 			#message("${${QM${_v}_VAR}}")
 			list(APPEND ${CPP${_v}_VAR} ${CPP_LIST})
@@ -416,17 +400,18 @@ macro(_qt_split_add_args _P _A)
 	foreach(_i ${ARGN})
 		if (NOT ("x${${_i}_Qt${_v}}" STREQUAL "x"))
 			list(APPEND ${_A} ${${_i}_Qt${_v}})
-		else()
+		elseif (("x${_i}" STREQUAL "xWIN32") OR
-			if (("x${_i}" STREQUAL "xWIN32") OR ("x${_i}" STREQUAL "xMACOSX_BUNDLE") OR ("x${_i}" STREQUAL "xSTATIC") OR ("x${_i}" STREQUAL "xSHARED") OR ("x${_i}" STREQUAL "xMODULE") OR ("x${_i}" STREQUAL "xEXCLUDE_FROM_ALL"))
+				("x${_i}" STREQUAL "xMACOSX_BUNDLE") OR
+				("x${_i}" STREQUAL "xSTATIC") OR
+				("x${_i}" STREQUAL "xSHARED") OR
+				("x${_i}" STREQUAL "xMODULE") OR
+				("x${_i}" STREQUAL "xEXCLUDE_FROM_ALL"))
 			list(APPEND ${_P} ${_i})
-			else()
+		elseif ("x${${_i}}" STREQUAL "x")
-				if ("x${${_i}}" STREQUAL "x")
 			list(APPEND ${_A} ${_i})
 		else()
 			list(APPEND ${_A} ${${_i}})
 		endif()
-			endif()
-		endif()
 	endforeach()
 endmacro()
 
@@ -583,12 +568,10 @@ macro(qt_install)
 					else()
 						set(_INST_LIST ${_INST_LIST} ${_i})
 					endif()
-				else()
+				elseif (_IS_FILES)
-					if (_IS_FILES)
 					set(_IS_FILES 0)
 					if (_IS_LANG)
 						if (("x${${_i}_Qt${_v}}" STREQUAL "x") OR ("x${_i}" STREQUAL "xDESTINATION"))
-								#return()
 							set(_INVALID 1)
 						else()
 							set(_INST_LIST ${_INST_LIST} ${${_i}_Qt${_v}})
@@ -601,8 +584,7 @@ macro(qt_install)
 						set(_IS_DEST 0)
 						if     ("x${_i}" STREQUAL "xQtBin")
 							set(_INST_LIST ${_INST_LIST} "${Qt${_v}_BIN}")
-							else()
+						elseif ("x${_i}" STREQUAL "xQtLang")
-								if ("x${_i}" STREQUAL "xQtLang")
 							set(_INST_LIST ${_INST_LIST} "${Qt${_v}_LANG_DIR}")
 						else()
 							set(_ind -1)
@@ -615,30 +597,22 @@ macro(qt_install)
 								set(_INST_LIST ${_INST_LIST} ${_o})
 							endif()
 						endif()
-							endif()
 					else()
 						set(_ii ${_i})
 						if     ("x${_i}" STREQUAL "xTARGETS")
 							set(_IS_TARGET 1)
-							else()
+						elseif ("x${_i}" STREQUAL "xFILES")
-								if ("x${_i}" STREQUAL "xFILES")
 							set(_IS_FILES 1)
-								else()
+						elseif ("x${_i}" STREQUAL "xDESTINATION")
-									if ("x${_i}" STREQUAL "xDESTINATION")
 							set(_IS_DEST 1)
-									else()
+						elseif ("x${_i}" STREQUAL "xLANG")
-										if ("x${_i}" STREQUAL "xLANG")
 							set(_IS_FILES 1)
 							set(_IS_LANG 1)
 							set(_ii "FILES")
 						endif()
-									endif()
-								endif()
-							endif()
 						set(_INST_LIST ${_INST_LIST} ${_ii})
 					endif()
 				endif()
-				endif()
 			endforeach()
 			if (NOT _INVALID)
 				if (NOT ("x${_prev_inst}" STREQUAL "x${_INST_LIST}"))