From 6063123ee014bb84f3aa4e3a8bbb4bddd390f094 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 31 Jan 2022 19:55:41 +0300 Subject: [PATCH] basic qt6 support --- DeployMacros.cmake | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/DeployMacros.cmake b/DeployMacros.cmake index cac63c9..6a9c08d 100644 --- a/DeployMacros.cmake +++ b/DeployMacros.cmake @@ -353,6 +353,12 @@ set(__gradle_sign macro(deploy_target _T) set(_DESTINATION "${CMAKE_INSTALL_PREFIX}") set(_DEPLOY_DIR "${CMAKE_INSTALL_PREFIX}") + set(_Qt_) + if (${LOCAL_FOUND6}) + set(_Qt_ 6) + elseif (${LOCAL_FOUND5}) + set(_Qt_ 5) + endif() set(_RES_DIRS) set(_RES_FILES) set(_PLUG_DIRS) @@ -565,7 +571,7 @@ macro(deploy_target _T) endif() set(_dt_opts -L "${CMAKE_READELF}" --dpkg-workdir "${CMAKE_DPKG_WORKDIR}" -s "${_dt_searchdirs}") endif() - list(APPEND _dt_opts -q "${Qt5_ROOT}" --qt-conf-dir "${_bin_path}" --qt-plugins-dir "${_pli_path}" --rpath) + list(APPEND _dt_opts -q "${Qt${_Qt_}_ROOT}" --qt-conf-dir "${_bin_path}" --qt-plugins-dir "${_pli_path}" --rpath) set(_deb_name "${_TV}_${_TARGET_OS}_${_DEB_ARCH}.deb") set(_TARGET_PACKAGE "${_deb_name}") #message("VER = \"${_DEBVERSION}\"") @@ -685,7 +691,7 @@ macro(deploy_target _T) # gather dir ${_CMD_} - COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -P windows,minimal -S windows -q "\"${Qt5_ROOT}\"" -s "\"${CMAKE_PREFIX_PATH}/bin${_dt_delim}${MINGW_BIN}${_add_search_path}${_dt_delim}${MINGW_LIB}\"" -o "${_AGD}" -p "${_AGD}" "\"${_AGD}$\"" ${_ADD_DEPS} + COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -P windows,minimal -S windows -q "\"${Qt${_Qt_}_ROOT}\"" -s "\"${CMAKE_PREFIX_PATH}/bin${_dt_delim}${MINGW_BIN}${_add_search_path}${_dt_delim}${MINGW_LIB}\"" -o "${_AGD}" -p "${_AGD}" "\"${_AGD}$\"" ${_ADD_DEPS} # zip COMMAND cd "\"${_DEPLOY_DIR}\"" "&&" zip -q -r "\"${_DESTINATION}/${_zip_name}\"" "\"${_TV}_win_${MY_ARCH}\"" COMMENT "Generating ${_zip_name}" @@ -792,11 +798,11 @@ macro(deploy_target _T) set(_dir "${CMAKE_BINARY_DIR}/android-build/libs" "${CMAKE_CURRENT_SOURCE_DIR}/android/res" "${CMAKE_CURRENT_SOURCE_DIR}/android/src") __make_copy(_CMD_ _dir _file "${_AGD}") set(_dir) - set(_file "${Qt5_ROOT}/src/android/templates/res/values/libs.xml") + set(_file "${Qt${_Qt_}_ROOT}/src/android/templates/res/values/libs.xml") __make_copy(_CMD_ _dir _file "${_AGD}/res/values") - set(_dir "${Qt5_ROOT}/src/3rdparty/gradle/gradle") - set(_file "${Qt5_ROOT}/src/3rdparty/gradle/gradlew" - "${Qt5_ROOT}/src/3rdparty/gradle/gradlew.bat") + set(_dir "${Qt${_Qt_}_ROOT}/src/3rdparty/gradle/gradle") + set(_file "${Qt${_Qt_}_ROOT}/src/3rdparty/gradle/gradlew" + "${Qt${_Qt_}_ROOT}/src/3rdparty/gradle/gradlew.bat") __make_copy(_CMD_ _dir _file "${_AGD}") #message("bindir = ${CMAKE_CURRENT_SOURCE_DIR}") set(SDK_ROOT "$ENV{ANDROID_SDK_ROOT}") @@ -826,7 +832,7 @@ macro(deploy_target _T) string(REPLACE "${ANDROID_SYSROOT_${ANDROID_ABI}}" "${ANDROID_SYSROOT_${_a}}" _lib_${_a} "${_lib_}") #message("search = ${_a_prefix}/lib") __make_copy(_CMD_ _empty _lib_${_a} "${_AGD}/libs/${_a}") - set(_CMD_ ${_CMD_} COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -s "${_a_prefix}/lib${_dt_delim}${Qt5_ROOT}/lib${_add_search_path}" -o "\"${_AGD}/libs/${_a}\"" --ignore "\"c${_dt_delim}m${_dt_delim}z${_dt_delim}dl${_dt_delim}log\"" "\"${_AGD}/libs/${_a}/lib${_AT}_${_a}.so\"" ${_ADD_DEPS}) + set(_CMD_ ${_CMD_} COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -s "${_a_prefix}/lib${_dt_delim}${Qt${_Qt_}_ROOT}/lib${_add_search_path}" -o "\"${_AGD}/libs/${_a}\"" --ignore "\"c${_dt_delim}m${_dt_delim}z${_dt_delim}dl${_dt_delim}log\"" "\"${_AGD}/libs/${_a}/lib${_AT}_${_a}.so\"" ${_ADD_DEPS}) #message("c++_${_a} -> ${_lib_${_a}}") endif() endforeach() @@ -851,7 +857,7 @@ macro(deploy_target _T) set(ANDROID_NEW_LOADER "false") endif() set(__ANDROID_DEBUG_KEYSTORE__ "${_modules_dir}/android_debug.keystore") - set(QT_DIR ${Qt5_ROOT}) + set(QT_DIR ${Qt${_Qt_}_ROOT}) set(_out_json "${CMAKE_CURRENT_BINARY_DIR}/${_T}_android_deployment_settings.json") configure_file("${CMAKE_BINARY_DIR}/android_deployment_settings.json.in" "${_out_json}") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml.in" "${_AGD}/AndroidManifest.xml") @@ -870,7 +876,7 @@ macro(deploy_target _T) if ("x${__gradle_lang}" STREQUAL "x") set(__gradle_lang "\"en\"") endif() - file(READ "${Qt5_ROOT}/src/android/templates/build.gradle" _file) + file(READ "${Qt${_Qt_}_ROOT}/src/android/templates/build.gradle" _file) string(REPLACE "\ndependencies {" "\ndependencies {${_depstr}" _file "${_file}") string(REPLACE "\nandroid {" "\nandroid {\n${__gradle_sign}\n${__gradle_lang_start}${__gradle_lang}\n\t}\n" _file "${_file}") string(REPLACE "['resources']" "['res']" _file "${_file}") @@ -879,7 +885,7 @@ macro(deploy_target _T) if (NOT __win_host) set(_gradle_home "-g" "${CMAKE_BINARY_DIR}") endif() - set(_CMD_ ${_CMD_} COMMAND "${Qt5_BIN}/androiddeployqt" --aux-mode --android-platform ${ANDROID_PLATFORM} --output "\"${_AGD}\"" --input "\"${_out_json}\"") + set(_CMD_ ${_CMD_} COMMAND "${Qt${_Qt_}_BIN}/androiddeployqt" --aux-mode --android-platform ${ANDROID_PLATFORM} --output "\"${_AGD}\"" --input "\"${_out_json}\"") set(_CMD_ ${_CMD_} COMMAND "${_AGD}/gradlew" ${_gradle_home} --no-daemon -p "\"${_AGD}\"" assembleDebug) set(_CMD_ ${_CMD_} COMMAND "${_AGD}/gradlew" ${_gradle_home} --no-daemon -p "\"${_AGD}\"" bundleRelease) set(_base_name "${_TV}_${_TARGET_OS}_${_TARGET_ARCH}")