From d33cf13923c1016bd192d3859e705dd5b11778c2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Mar 2020 13:51:36 +0100 Subject: [PATCH] Apply cmake-format --- cmake/modules/AndroidApk.cmake | 9 +++++---- cmake/modules/QtConfig.cmake | 15 ++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cmake/modules/AndroidApk.cmake b/cmake/modules/AndroidApk.cmake index 6b73d12..44a2902 100644 --- a/cmake/modules/AndroidApk.cmake +++ b/cmake/modules/AndroidApk.cmake @@ -230,9 +230,10 @@ if (NOT ANDROID_APK_QML_IMPORT_DIRS) endif () # pick extra plugins from install prefix -compose_dirs_for_android_apk(OUTPUT_VARIABLE ANDROID_APK_EXTRA_PLUGIN_DIRS POSSIBLE_DIRS "${QT_INSTALL_PLUGINS}" - "${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/qt/plugins" - "${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/plugins") +compose_dirs_for_android_apk( + OUTPUT_VARIABLE ANDROID_APK_EXTRA_PLUGIN_DIRS POSSIBLE_DIRS "${QT_INSTALL_PLUGINS}" + "${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/qt/plugins" + "${CMAKE_INSTALL_FULL_LIBDIR}${SELECTED_LIB_SUFFIX}/plugins") if (NOT ANDROID_APK_EXTRA_PLUGIN_DIRS) message(WARNING "Unable to find extra plugin directories for making the APK.") endif () @@ -284,7 +285,7 @@ else () set(ANDROID_APK_FILE_PATH "${ANDROID_APK_BUILD_DIR}/build/outputs/apk/${ANDROID_APK_FILE_DIRECTORY}apk-release-signed.apk") list(APPEND ANDROID_APK_ADDITIONAL_ANDROIDDEPOYQT_OPTIONS --sign "${ANDROID_APK_KEYSTORE_URL}" - "${ANDROID_APK_KEYSTORE_ALIAS}") + "${ANDROID_APK_KEYSTORE_ALIAS}") if (ANDROID_APK_KEYSTORE_PASSWORD) list(APPEND ANDROID_APK_ADDITIONAL_ANDROIDDEPOYQT_OPTIONS --storepass "${ANDROID_APK_KEYSTORE_PASSWORD}") endif () diff --git a/cmake/modules/QtConfig.cmake b/cmake/modules/QtConfig.cmake index 711f9b2..8c4696b 100644 --- a/cmake/modules/QtConfig.cmake +++ b/cmake/modules/QtConfig.cmake @@ -226,11 +226,11 @@ if (QT_INSTALL_TRANSLATIONS) endif () if (CMAKE_FIND_ROOT_PATH) list(APPEND QT_TRANSLATION_SEARCH_PATHS "${CMAKE_FIND_ROOT_PATH}/${CMAKE_INSTALL_DATAROOTDIR}/qt/translations" - "${CMAKE_FIND_ROOT_PATH}/${CMAKE_INSTALL_DATAROOTDIR}/qt5/translations") + "${CMAKE_FIND_ROOT_PATH}/${CMAKE_INSTALL_DATAROOTDIR}/qt5/translations") endif () list(APPEND QT_TRANSLATION_SEARCH_PATHS "${CMAKE_INSTALL_FULL_DATAROOTDIR}/qt/translations" - "${CMAKE_INSTALL_FULL_DATAROOTDIR}/qt5/translations" "/usr/${CMAKE_INSTALL_DATAROOTDIR}/qt/translations" - "/usr/${CMAKE_INSTALL_DATAROOTDIR}/qt5/translations") + "${CMAKE_INSTALL_FULL_DATAROOTDIR}/qt5/translations" "/usr/${CMAKE_INSTALL_DATAROOTDIR}/qt/translations" + "/usr/${CMAKE_INSTALL_DATAROOTDIR}/qt5/translations") list(REMOVE_DUPLICATES QT_TRANSLATION_SEARCH_PATHS) foreach (QT_TRANSLATION_PATH ${QT_TRANSLATION_SEARCH_PATHS}) if (NOT IS_DIRECTORY "${QT_TRANSLATION_PATH}") @@ -361,7 +361,8 @@ if (REQUIRED_ICONS) list(APPEND ICON_SEARCH_PATHS "${CMAKE_FIND_ROOT_PATH}/${CMAKE_INSTALL_DATAROOTDIR}/icons") endif () list(APPEND ICON_SEARCH_PATHS "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons") - list(APPEND ICON_SEARCH_PATHS "/usr/${CMAKE_INSTALL_DATAROOTDIR}/icons") # find icons from regular prefix when cross-compiling + list(APPEND ICON_SEARCH_PATHS "/usr/${CMAKE_INSTALL_DATAROOTDIR}/icons") # find icons from regular prefix when cross- + # compiling list(REMOVE_DUPLICATES ICON_SEARCH_PATHS) set(BUILTIN_ICONS_DIR "${CMAKE_CURRENT_BINARY_DIR}/icons") set(DEFAULT_THEME_INDEX_FILE "${BUILTIN_ICONS_DIR}/default/index.theme") @@ -408,8 +409,8 @@ if (REQUIRED_ICONS) set(GLOB_PATTERNS) foreach (REQUIRED_ICON ${REQUIRED_ICONS}) list(APPEND GLOB_PATTERNS "${ICON_THEME_PATH}/${REQUIRED_ICON}" - "${ICON_THEME_PATH}/${REQUIRED_ICON}.*" "${ICON_THEME_PATH}/*/${REQUIRED_ICON}" - "${ICON_THEME_PATH}/*/${REQUIRED_ICON}.*") + "${ICON_THEME_PATH}/${REQUIRED_ICON}.*" "${ICON_THEME_PATH}/*/${REQUIRED_ICON}" + "${ICON_THEME_PATH}/*/${REQUIRED_ICON}.*") endforeach () file( GLOB_RECURSE GLOBBED_ICON_THEME_FILES @@ -444,7 +445,7 @@ if (REQUIRED_ICONS) file(MAKE_DIRECTORY "${BUILTIN_ICONS_DIR}/${NEW_ICON_THEME_FILE_DIR}") file(COPY "${ICON_THEME_FILE}" DESTINATION "${BUILTIN_ICONS_DIR}/${NEW_ICON_THEME_FILE_DIR}") list(APPEND ICON_THEME_FILES - "${NEW_ICON_THEME_FILE_RELATIVE_PATH}") + "${NEW_ICON_THEME_FILE_RELATIVE_PATH}") endforeach () break() endif ()