diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2022-03-20 12:57:52 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2022-03-24 16:24:38 +0000 |
| commit | a720a6380ca75ec23e0635cc8ae47ee4b9508be0 (patch) | |
| tree | c9e44d079d7c392b3f7b2beeeea748236f2de6c8 /modules/ECMGeneratePriFile.cmake | |
| parent | 4047d1a676ac6133f357d6aca63f3093381b0986 (diff) | |
| download | extra-cmake-modules-a720a6380ca75ec23e0635cc8ae47ee4b9508be0.tar.gz extra-cmake-modules-a720a6380ca75ec23e0635cc8ae47ee4b9508be0.tar.bz2 | |
Port from ECMQueryQmake to ECMQueryQt
Continuation of commit 4e47b053c9d799.
All unittests still pass.
Diffstat (limited to 'modules/ECMGeneratePriFile.cmake')
| -rw-r--r-- | modules/ECMGeneratePriFile.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
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() |