[Digikam-devel] bug in core/CMakeLists.txt for AkonadiContact version checking

[Eric Valette]

On 16/12/2015 22:14, Eric Valette wrote:
> On 16/12/2015 21:57, Eric Valette wrote:
>
> BTW you have the exact same bug in
>
> core/CMakeLists.txt:160
>
> but for KF5AkonadiContact this time
>
> find_package(KF5 ${KF5_MIN_VERSION}
>               OPTIONAL_COMPONENTS
>               ItemModels             # For geolocation support (mandatory).
>               Bookmarks              # For geolocation support (optional).
>               AkonadiContact         # For KDE Mail Contacts support.
> <==================
>               FileMetaData           # For KDE file indexer support.
> )
>
>
> AkonadiContact is also at 4.82.0  an is not yet part of framework...
>
> --eric
>
>
>

Attached proposed fix...

-- eric


-------------- next part --------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dbcab1..917aa21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,10 +161,15 @@ find_package(KF5 ${KF5_MIN_VERSION}
              OPTIONAL_COMPONENTS
              ItemModels             # For geolocation support (mandatory).
              Bookmarks              # For geolocation support (optional).
-             AkonadiContact         # For KDE Mail Contacts support.
+#             AkonadiContact         # For KDE Mail Contacts support.
              FileMetaData           # For KDE file indexer support.
 )
 
+find_package(KF5 "4.89.0"
+             OPTIONAL_COMPONENTS
+             AkonadiContact         # For KDE Mail Contacts support.
+)
+
 if(ENABLE_AKONADICONTACTSUPPORT AND NOT KF5AkonadiContact_FOUND)
     set(ENABLE_KFILEMETADATASUPPORT OFF)
 endif()