[pim/kitinerary] /: Remove pre-KF KMime compatibility
Volker Krause <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit e340d6f93193b1e447e0808a44b5cd8efc827a2b by Volker Krause.
Committed on 14/08/2026 at 16:30.
Pushed by vkrause into branch 'master'.
Remove pre-KF KMime compatibility
That doesn't exist anymore with 26.08.
M +2 -8 CMakeLists.txt
M +1 -8 KPimItineraryConfig.cmake.in
https://invent.kde.org/pim/kitinerary/-/commit/e340d6f93193b1e447e0808a44b5cd8efc827a2b
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 309ddd54..223ac92e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(PIM_VERSION "6.8.40")
project(KItinerary VERSION ${PIM_VERSION})
set(QT_REQUIRED_VERSION "6.7.0")
-set(KF_MIN_VERSION "6.26.0")
+set(KF_MIN_VERSION "6.27.0")
find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
@@ -43,19 +43,13 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KITINERARY
)
find_package(Qt6 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Gui Qml)
-find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Contacts CalendarCore Codecs I18n)
+find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Contacts CalendarCore Codecs I18n Mime)
if (NOT ANDROID)
find_package(SharedMimeInfo 1.3 REQUIRED)
endif()
-set(KMIME_VERSION "6.7.0")
set(PIM_PKPASS "6.7.41")
-find_package(KF6Mime ${KF_MIN_VERSION} CONFIG)
-if(NOT TARGET KF6::Mime)
- find_package(KPim6Mime ${KMIME_VERSION} CONFIG REQUIRED)
- add_library(KF6::Mime ALIAS KPim6::Mime)
-endif()
find_package(KPim6PkPass ${PIM_PKPASS} CONFIG REQUIRED)
find_package(Poppler COMPONENTS Core)
set_package_properties("Poppler" PROPERTIES TYPE REQUIRED PURPOSE "Support for extraction from PDF booking confirmations.")
diff --git a/KPimItineraryConfig.cmake.in b/KPimItineraryConfig.cmake.in
index f617c9b0..71d36308 100644
--- a/KPimItineraryConfig.cmake.in
+++ b/KPimItineraryConfig.cmake.in
@@ -6,16 +6,9 @@
include(CMakeFindDependencyMacro)
find_dependency(Qt6Gui "@QT_REQUIRED_VERSION@")
-if(@KF6Mime_FOUND@)
- find_dependency(KF6Mime "@KF_MIN_VERSION@")
-else()
- find_dependency(KPim6Mime "@KMIME_VERSION@")
- if(NOT TARGET KF6::Mime)
- add_library(KF6::Mime ALIAS KPim6::Mime)
- endif()
-endif()
find_dependency(KF6CalendarCore "@KF_MIN_VERSION@")
find_dependency(KF6Contacts "@KF_MIN_VERSION@")
+find_dependency(KF6Mime "@KF_MIN_VERSION@")
find_dependency(KPim6PkPass "@PIM_PKPASS@")
if (NOT @BUILD_SHARED_LIBS@)