diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ECMAddQch.cmake | 4 | ||||
| -rw-r--r-- | modules/ECMFindQmlModule.cmake.in | 4 | ||||
| -rw-r--r-- | modules/ECMGeneratePriFile.cmake | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/modules/ECMAddQch.cmake b/modules/ECMAddQch.cmake index f494c543..bd8116a6 100644 --- a/modules/ECMAddQch.cmake +++ b/modules/ECMAddQch.cmake @@ -258,7 +258,7 @@ Since 5.36.0. include(CMakeParseArguments) include(${CMAKE_CURRENT_LIST_DIR}/../modules/QtVersionOption.cmake) -include(ECMQueryQmake) +include(ECMQueryQt) # Helper method: adding the LINK_QCHS property to a Qt QCH targets, from module base names ("Core" etc.) @@ -282,7 +282,7 @@ function(_ecm_ensure_qt_qch_targets) # get Qt version, if any find_package(Qt${QT_MAJOR_VERSION}Core CONFIG QUIET) # lookup tag files - query_qmake(qt_docs_dir QT_INSTALL_DOCS TRY) + ecm_query_qt(qt_docs_dir QT_INSTALL_DOCS TRY) find_path(_qtcoreTagsPath qtcore/qtcore.tags PATHS ${qt_docs_dir} diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in index 6c054bf0..0ee5665e 100644 --- a/modules/ECMFindQmlModule.cmake.in +++ b/modules/ECMFindQmlModule.cmake.in @@ -8,8 +8,8 @@ include(FindPackageHandleStandardArgs) include("${ECM_MODULE_DIR}/QtVersionOption.cmake") if (QT_MAJOR_VERSION EQUAL "5") - include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") - query_qmake(qt_binaries_dir QT_HOST_BINS) + include("${ECM_MODULE_DIR}/ECMQueryQt.cmake") + ecm_query_qt(qt_binaries_dir QT_HOST_BINS) find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) elseif (QT_MAJOR_VERSION EQUAL "6") find_package(Qt6 COMPONENTS QmlTools REQUIRED) diff --git a/modules/ECMGeneratePriFile.cmake b/modules/ECMGeneratePriFile.cmake index 295656ca..9fdf713a 100644 --- a/modules/ECMGeneratePriFile.cmake +++ b/modules/ECMGeneratePriFile.cmake @@ -89,19 +89,19 @@ Since pre-1.0.0. # Replicate the logic from KDEInstallDirs.cmake as we can't depend on it # Ask qmake if we're using the same prefix as Qt -set(_askqmake OFF) +set(_should_query_qt OFF) if(NOT DEFINED KDE_INSTALL_USE_QT_SYS_PATHS) - include(ECMQueryQmake) - query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX TRY) + include(ECMQueryQt) + ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX TRY) if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") - set(_askqmake ON) + set(_should_query_qt ON) endif() endif() -if(KDE_INSTALL_USE_QT_SYS_PATHS OR _askqmake) - include(ECMQueryQmake) - query_qmake(qt_install_prefix_dir QT_INSTALL_PREFIX) - query_qmake(qt_host_data_dir QT_HOST_DATA) +if(KDE_INSTALL_USE_QT_SYS_PATHS OR _should_query_qt) + include(ECMQueryQt) + ecm_query_qt(qt_install_prefix_dir QT_INSTALL_PREFIX) + ecm_query_qt(qt_host_data_dir QT_HOST_DATA) if(qt_install_prefix_dir STREQUAL "${CMAKE_INSTALL_PREFIX}") file(RELATIVE_PATH qt_host_data_dir ${qt_install_prefix_dir} ${qt_host_data_dir}) endif() |