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 /src/qml | |
| 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 'src/qml')
| -rw-r--r-- | src/qml/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 1cdae88a..17f90ad0 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -16,7 +16,7 @@ ecm_generate_export_header(KF5ConfigQml target_link_libraries(KF5ConfigQml PUBLIC KF5::ConfigCore # KCoreConfigSkeleton, in ConfigPropertyMap - Qt5::Qml + Qt${QT_MAJOR_VERSION}::Qml ) set_target_properties(KF5ConfigQml PROPERTIES VERSION ${KCONFIG_VERSION} SOVERSION ${KCONFIG_SOVERSION} @@ -29,11 +29,11 @@ ecm_generate_headers(KConfigQml_HEADERS REQUIRED_HEADERS KConfigQml_HEADERS ) -target_include_directories(KF5ConfigQml INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigQml>") +target_include_directories(KF5ConfigQml INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KConfigQml>") install(TARGETS KF5ConfigQml EXPORT KF5ConfigTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kconfigqml_export.h ${KConfigQml_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigQml COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KConfigQml COMPONENT Devel ) |