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/core | |
| 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/core')
| -rw-r--r-- | src/core/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index c91dd040..2b5e949c 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -41,12 +41,12 @@ target_compile_definitions(KF5ConfigCore KCONF_UPDATE_INSTALL_LOCATION="${KDE_INSTALL_FULL_LIBEXECDIR_KF5}/$<TARGET_FILE_NAME:KF5::kconf_update>" ) -target_include_directories(KF5ConfigCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigCore>") +target_include_directories(KF5ConfigCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KConfigCore>") -target_link_libraries(KF5ConfigCore PUBLIC Qt5::Core) +target_link_libraries(KF5ConfigCore PUBLIC Qt${QT_MAJOR_VERSION}::Core) if(KCONFIG_USE_DBUS) - target_link_libraries(KF5ConfigCore PRIVATE Qt5::DBus) + target_link_libraries(KF5ConfigCore PRIVATE Qt${QT_MAJOR_VERSION}::DBus) endif() set_target_properties(KF5ConfigCore PROPERTIES VERSION ${KCONFIG_VERSION} @@ -98,7 +98,7 @@ install(TARGETS KF5ConfigCore EXPORT KF5ConfigTargets ${KF5_INSTALL_TARGETS_DEFA install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kconfigcore_export.h ${KConfigCore_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigCore COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KConfigCore COMPONENT Devel ) # make available to ecm_add_qch in parent folder @@ -106,5 +106,5 @@ set(KConfigCore_APIDOX_SRCS ${KConfigCore_HEADERS} PARENT_SCOPE) set(KConfigCore_APIDOX_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KConfigCore LIB_NAME KF5ConfigCore DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigCore) +ecm_generate_pri_file(BASE_NAME KConfigCore LIB_NAME KF5ConfigCore DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KConfigCore) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) |