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

This commit is contained in:
2020-03-25 15:23:49 +00:00
parent 06df5a47c0
commit 45815ee290

View File

@@ -212,7 +212,6 @@ macro(find_qt)
endif()
endif()
endif()
# set()
foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v})
foreach(_p ${Qt${_v}_INCLUDES})
@@ -235,19 +234,15 @@ macro(qt_sources OUT)
set(_REGEXP)
set(_REGEXP_WD)
foreach(_i ${ARGN})
if (_IS_DIR)
if (_IS_DIR)
set(_DIR "${_i}")
set(_IS_DIR 0)
elseif ("x${_i}" STREQUAL "xDIR")
set(_IS_DIR 1)
elseif ("x${_i}" STREQUAL "xNO_DEFAULT")
set(_NO_DEFAULT 1)
else()
if ("x${_i}" STREQUAL "xDIR")
set(_IS_DIR 1)
else()
if ("x${_i}" STREQUAL "xNO_DEFAULT")
set(_NO_DEFAULT 1)
else()
list(APPEND _REGEXP ${_i})
endif()
endif()
list(APPEND _REGEXP ${_i})
endif()
endforeach()
if (NOT "x${_DIR}" STREQUAL "x")
@@ -278,36 +273,26 @@ macro(qt_wrap)
set(WAS_QM_ARG 0)
set(FILE_LIST)
foreach(_i ${ARGN})
if (_HDR_ARG)
if (_HDR_ARG)
set(HDR_VAR ${_i})
set(WAS_HDR_ARG 1)
set(_HDR_ARG 0)
elseif (_CPP_ARG)
set(CPP_VAR ${_i})
set(WAS_CPP_ARG 1)
set(_CPP_ARG 0)
elseif (_QM_ARG)
set(QM_VAR ${_i})
set(WAS_QM_ARG 1)
set(_QM_ARG 0)
elseif ("x${_i}" STREQUAL "xHDRS")
set(_HDR_ARG 1)
elseif ("x${_i}" STREQUAL "xCPPS")
set(_CPP_ARG 1)
elseif ("x${_i}" STREQUAL "xQMS")
set(_QM_ARG 1)
else()
if (_CPP_ARG)
set(CPP_VAR ${_i})
set(WAS_CPP_ARG 1)
set(_CPP_ARG 0)
else()
if (_QM_ARG)
set(QM_VAR ${_i})
set(WAS_QM_ARG 1)
set(_QM_ARG 0)
else()
if ("x${_i}" STREQUAL "xHDRS")
set(_HDR_ARG 1)
else()
if ("x${_i}" STREQUAL "xCPPS")
set(_CPP_ARG 1)
else()
if ("x${_i}" STREQUAL "xQMS")
set(_QM_ARG 1)
else()
list(APPEND FILE_LIST "${_i}")
endif()
endif()
endif()
endif()
endif()
list(APPEND FILE_LIST "${_i}")
endif()
endforeach()
foreach(_v ${_QT_VERSIONS_})
@@ -382,17 +367,16 @@ macro(qt_wrap)
set(${QM${_v}_VAR} "")
qt4_add_translation(${QM${_v}_VAR} ${TS_LIST})
endif()
else()
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})
if (WAS_QM_ARG)
set(${QM${_v}_VAR} "")
qt5_add_translation(${QM${_v}_VAR} ${TS_LIST})
endif()
else()
elseif (${_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})
if (WAS_QM_ARG)
set(${QM${_v}_VAR} "")
qt5_add_translation(${QM${_v}_VAR} ${TS_LIST})
endif()
else()
# Qt6 ...
endif()
#message("${${QM${_v}_VAR}}")
list(APPEND ${CPP${_v}_VAR} ${CPP_LIST})
@@ -416,16 +400,17 @@ macro(_qt_split_add_args _P _A)
foreach(_i ${ARGN})
if (NOT ("x${${_i}_Qt${_v}}" STREQUAL "x"))
list(APPEND ${_A} ${${_i}_Qt${_v}})
elseif (("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"))
list(APPEND ${_P} ${_i})
elseif ("x${${_i}}" STREQUAL "x")
list(APPEND ${_A} ${_i})
else()
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"))
list(APPEND ${_P} ${_i})
else()
if ("x${${_i}}" STREQUAL "x")
list(APPEND ${_A} ${_i})
else()
list(APPEND ${_A} ${${_i}})
endif()
endif()
list(APPEND ${_A} ${${_i}})
endif()
endforeach()
endmacro()
@@ -583,60 +568,49 @@ macro(qt_install)
else()
set(_INST_LIST ${_INST_LIST} ${_i})
endif()
else()
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}})
endif()
elseif (_IS_FILES)
set(_IS_FILES 0)
if (_IS_LANG)
if (("x${${_i}_Qt${_v}}" STREQUAL "x") OR ("x${_i}" STREQUAL "xDESTINATION"))
set(_INVALID 1)
else()
set(_INST_LIST ${_INST_LIST} ${_i})
set(_INST_LIST ${_INST_LIST} ${${_i}_Qt${_v}})
endif()
else()
if (_IS_DEST)
set(_IS_DEST 0)
if ("x${_i}" STREQUAL "xQtBin")
set(_INST_LIST ${_INST_LIST} "${Qt${_v}_BIN}")
else()
if ("x${_i}" STREQUAL "xQtLang")
set(_INST_LIST ${_INST_LIST} "${Qt${_v}_LANG_DIR}")
else()
set(_ind -1)
string(FIND "${_i}" "QtPlugins" _ind)
if (_ind GREATER -1)
string(REPLACE "QtPlugins" "${Qt${_v}_PLUGINS_DIR}" _o "${_i}")
set(_INST_LIST ${_INST_LIST} "${_o}")
else()
string(REPLACE "\\" "/" _o "${_i}")
set(_INST_LIST ${_INST_LIST} ${_o})
endif()
endif()
endif()
set(_INST_LIST ${_INST_LIST} ${_i})
endif()
else()
if (_IS_DEST)
set(_IS_DEST 0)
if ("x${_i}" STREQUAL "xQtBin")
set(_INST_LIST ${_INST_LIST} "${Qt${_v}_BIN}")
elseif ("x${_i}" STREQUAL "xQtLang")
set(_INST_LIST ${_INST_LIST} "${Qt${_v}_LANG_DIR}")
else()
set(_ii ${_i})
if ("x${_i}" STREQUAL "xTARGETS")
set(_IS_TARGET 1)
set(_ind -1)
string(FIND "${_i}" "QtPlugins" _ind)
if (_ind GREATER -1)
string(REPLACE "QtPlugins" "${Qt${_v}_PLUGINS_DIR}" _o "${_i}")
set(_INST_LIST ${_INST_LIST} "${_o}")
else()
if ("x${_i}" STREQUAL "xFILES")
set(_IS_FILES 1)
else()
if ("x${_i}" STREQUAL "xDESTINATION")
set(_IS_DEST 1)
else()
if ("x${_i}" STREQUAL "xLANG")
set(_IS_FILES 1)
set(_IS_LANG 1)
set(_ii "FILES")
endif()
endif()
endif()
string(REPLACE "\\" "/" _o "${_i}")
set(_INST_LIST ${_INST_LIST} ${_o})
endif()
set(_INST_LIST ${_INST_LIST} ${_ii})
endif()
else()
set(_ii ${_i})
if ("x${_i}" STREQUAL "xTARGETS")
set(_IS_TARGET 1)
elseif ("x${_i}" STREQUAL "xFILES")
set(_IS_FILES 1)
elseif ("x${_i}" STREQUAL "xDESTINATION")
set(_IS_DEST 1)
elseif ("x${_i}" STREQUAL "xLANG")
set(_IS_FILES 1)
set(_IS_LANG 1)
set(_ii "FILES")
endif()
set(_INST_LIST ${_INST_LIST} ${_ii})
endif()
endif()
endforeach()