diff --git a/qad/cmake/QtWraps.cmake b/qad/cmake/QtWraps.cmake index a684c2e..a05de36 100644 --- a/qad/cmake/QtWraps.cmake +++ b/qad/cmake/QtWraps.cmake @@ -576,6 +576,7 @@ endmacro() macro(qt_install) set(_prev_inst) + set(__add_args) #message("command: ${ARGN}") foreach(_v ${_QT_VERSIONS_}) if (LOCAL_FOUND${_v}) @@ -593,38 +594,44 @@ macro(qt_install) foreach(_i ${ARGN}) if (_IS_TARGET) set(_IS_TARGET 0) + set(__target ${_i}) if (_${_i}_is_qt) - set(_INST_LIST ${_INST_LIST} ${_i}${TARGET_SUFFIX_Qt${_v}}) - else() - set(_INST_LIST ${_INST_LIST} ${_i}) + set(__target ${_i}${TARGET_SUFFIX_Qt${_v}}) endif() + if (DEFINED ANDROID_PLATFORM) + get_target_property(_TT ${__target} TYPE) + if ("x${_TT}" STREQUAL "xEXECUTABLE") + list(APPEND __add_args EXCLUDE_FROM_ALL) + endif() + endif() + list(APPEND _INST_LIST ${__target}) 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}_Qt${_v}}) + list(APPEND _INST_LIST ${${_i}_Qt${_v}}) endif() else() - set(_INST_LIST ${_INST_LIST} ${_i}) + list(APPEND _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}") + list(APPEND _INST_LIST "${Qt${_v}_BIN}") elseif ("x${_i}" STREQUAL "xQtLang") - set(_INST_LIST ${_INST_LIST} "${Qt${_v}_LANG_DIR}") + list(APPEND _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}") + list(APPEND _INST_LIST "${_o}") else() string(REPLACE "\\" "/" _o "${_i}") - set(_INST_LIST ${_INST_LIST} ${_o}) + list(APPEND _INST_LIST ${_o}) endif() endif() else() @@ -640,14 +647,14 @@ macro(qt_install) set(_IS_LANG 1) set(_ii "FILES") endif() - set(_INST_LIST ${_INST_LIST} ${_ii}) + list(APPEND _INST_LIST ${_ii}) endif() endif() endforeach() if (NOT _INVALID) if (NOT ("x${_prev_inst}" STREQUAL "x${_INST_LIST}")) #message("install: ${_INST_LIST}") - install(${_INST_LIST}) + install(${_INST_LIST} ${__add_args}) set(_prev_inst "${_INST_LIST}") endif() endif()