Skip to content

Commit 48f1493

Browse files
committed
modify the containing qt plugins due to ecm changes on how they are generated and linked
1 parent dd9eb61 commit 48f1493

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+71
-6178
lines changed

CMakeLists.txt

+6-37
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,19 @@ cmake_minimum_required(VERSION 3.16)
33
set(CASK_VERSION 0.6.6)
44
project(MauiShell VERSION ${CASK_VERSION})
55

6+
set(QT_MAJOR_VERSION 6)
7+
68
set(REQUIRED_QT_VERSION 6.4)
7-
set(REQUIRED_KF_VERSION 5.109.0)
9+
set(REQUIRED_KF_VERSION 5.240.0)
810

911
set(CMAKE_CXX_STANDARD 20)
1012
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1113

12-
set(CMAKE_AUTOMOC ON)
13-
set(CMAKE_AUTORCC ON)
14-
15-
find_package(ECM ${REQUIRED_KF_VERSION} REQUIRED NO_MODULE)
14+
find_package(ECM ${REQUIRED_KF_VERSION} NO_MODULE)
1615
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
1716

18-
include(KDEInstallDirs)
19-
include(KDECompilerSettings NO_POLICY_SCOPE)
20-
include(KDECMakeSettings)
21-
22-
include(ECMInstallIcons)
23-
include(ECMAddAppIcon)
24-
include(ECMSetupVersion)
25-
include(ECMConfiguredInstall)
26-
include(ECMQtDeclareLoggingCategory)
2717
include(ECMSourceVersionControl)
28-
include(ECMGenerateHeaders)
29-
30-
include(FeatureSummary)
31-
include(GenerateExportHeader)
32-
include(FeatureSummary)
33-
34-
find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS
35-
Qml
36-
Quick
37-
Svg
38-
QuickControls2
39-
WaylandCompositor)
40-
41-
find_package(KF6 ${REQUIRED_KF_VERSION} REQUIRED COMPONENTS
42-
I18n
43-
Config
44-
Service)
45-
46-
find_package(MauiKit4)
47-
find_package(MauiMan4)
48-
find_package(CaskServer)
49-
find_package(MauiCore REQUIRED COMPONENTS Audio Notifications Power)
18+
include(ECMSetupVersion)
5019

5120
if(${ECM_SOURCE_UNDER_VERSION_CONTROL})
5221
execute_process(COMMAND git rev-parse --abbrev-ref HEAD
@@ -76,7 +45,7 @@ ecm_setup_version(${CASK_VERSION}
7645

7746
#set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/plugins ${CMAKE_BINARY_DIR}/org CACHE STRING "" FORCE)
7847

79-
add_subdirectory(casklib)
48+
add_subdirectory(caskcore) ##plugin and the public library
8049
add_subdirectory(plugins)
8150
add_subdirectory(startcask)
8251
add_subdirectory(src)

casklib/CMakeLists.txt

-61
This file was deleted.

casklib/CaskLibConfig.cmake.in

-12
This file was deleted.

casklib/LICENSES/BSD-2-Clause.txt

-22
This file was deleted.

casklib/LICENSES/CC0-1.0.txt

-119
This file was deleted.

0 commit comments

Comments
 (0)