diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2021-12-03 22:33:28 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2021-12-16 18:05:02 +0000 |
| commit | 10c4a4b4bdfdd468e52ae0fbbf84c77b64df2f8f (patch) | |
| tree | f8a26e38bb4764474d076199bcb91bb5da8c1fe9 /KF5ConfigConfig.cmake.in | |
| parent | bdb7f8bbd2d283fa87386a0fa2a505cb93b4a35c (diff) | |
| download | kconfig-10c4a4b4bdfdd468e52ae0fbbf84c77b64df2f8f.tar.gz kconfig-10c4a4b4bdfdd468e52ae0fbbf84c77b64df2f8f.tar.bz2 | |
WIP: Change the build system to enable building with Qt 6
This was built with:
-DQT_MAJOR_VERSION=6 \
-DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.90.0 \
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055a00
Move the include(KDEInstallDirs) call before the first find_package(Qt*,
the former is what auto-detects the Qt version, and defaults to 5. This is
needed to be able to build against Qt5 by default.
All unit tests still pass.
Diffstat (limited to 'KF5ConfigConfig.cmake.in')
| -rw-r--r-- | KF5ConfigConfig.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/KF5ConfigConfig.cmake.in b/KF5ConfigConfig.cmake.in index d24ae2ba..9b696ceb 100644 --- a/KF5ConfigConfig.cmake.in +++ b/KF5ConfigConfig.cmake.in @@ -6,10 +6,10 @@ include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Xml "@REQUIRED_QT_VERSION@") +find_dependency(Qt@QT_MAJOR_VERSION@Xml @REQUIRED_QT_VERSION@) if(@KCONFIG_USE_DBUS@) - find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") + find_dependency(Qt@QT_MAJOR_VERSION@DBus "@REQUIRED_QT_VERSION@") endif() if(CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING) |