diff options
| author | Laurent Montel <[email protected]> | 2023-11-08 07:23:16 +0100 |
|---|---|---|
| committer | Méven Car <[email protected]> | 2023-11-08 09:20:24 +0000 |
| commit | 1cf56b2303fea11a6686b1da6355e113f8ab78b7 (patch) | |
| tree | 39bc43b04e3dd4b1e958131de3d2df2170f2282a /CMakeLists.txt | |
| parent | 3fde6cbeb0b2df48a91870c74c4ef74462a82058 (diff) | |
Master is qt6 only. Not necessary to use ${QT_MAJOR_VERSION} now.
Remove qt5 specific cmake code too
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 20e2dfd4d..d9e574f2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,14 +37,14 @@ ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHIN ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHINVCS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake" - SOVERSION ${QT_MAJOR_VERSION} + SOVERSION 6 ) ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE - SOVERSION ${QT_MAJOR_VERSION} + SOVERSION 6 ) -find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS +find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Concurrent Widgets @@ -54,10 +54,6 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS if (UNIX AND NOT APPLE) set(HAVE_X11 TRUE) - - if (QT_MAJOR_VERSION STREQUAL "5") - find_package(Qt5X11Extras REQUIRED) - endif() endif() find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS @@ -102,15 +98,15 @@ set_package_properties(KF6Activities PROPERTIES DESCRIPTION "KActivities librari PURPOSE "For tracking which folders are frequently accessed on a Plasma desktop" ) -find_package(Phonon4Qt${QT_MAJOR_VERSION} CONFIG REQUIRED) +find_package(Phonon4Qt6 CONFIG REQUIRED) -find_package(PackageKitQt${QT_MAJOR_VERSION}) -set_package_properties(PackageKitQt${QT_MAJOR_VERSION} +find_package(PackageKitQt6) +set_package_properties(PackageKitQt6 PROPERTIES DESCRIPTION "Software Manager integration" TYPE OPTIONAL PURPOSE "Used in the service menu installer" ) -if(PackageKitQt${QT_MAJOR_VERSION}_FOUND) +if(PackageKitQt6_FOUND) set(HAVE_PACKAGEKIT TRUE) endif() |
