]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Make KFileMetaData optional again
authorFrank Reininghaus <frank78ac@googlemail.com>
Wed, 17 Feb 2016 21:10:54 +0000 (22:10 +0100)
committerFrank Reininghaus <frank78ac@googlemail.com>
Wed, 17 Feb 2016 21:10:54 +0000 (22:10 +0100)
In 15b20cd077c6743bb5ec947f5f3e014a4a32b110, I added KFileMetaData to
the required build dependencies in order to make the version increase
in 6c5930c229c8b96aae45e19ad4b7a1c57caa6ddc effective, and ensure that
the build fails at the CMake stage if the KFileMetaData version is too
old.

However, I had missed that KFileMetaData was already an optional
dependency. This commit makes it optional again and adjusts the
required version.

Thanks to Christoph Feck for notifying me about this issue and sorry
for the stupid mistake.

CCMAIL: cfeck@kde.org

CMakeLists.txt

index 8a6fcce428526b5b210bde729d2bb9917c05f095..c40020fed4992e0d13b63822319ef721c34b9e87 100644 (file)
@@ -66,7 +66,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     WindowSystem
     Notifications
     Crash
     WindowSystem
     Notifications
     Crash
-    FileMetaData
 )
 find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
     Activities
 )
 find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
     Activities
@@ -87,7 +86,7 @@ set_package_properties(KF5BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets"
                        TYPE OPTIONAL
                       )
 
                        TYPE OPTIONAL
                       )
 
-find_package(KF5FileMetaData 4.97)
+find_package(KF5FileMetaData 5.19.0)
 set_package_properties(KF5FileMetaData PROPERTIES
                        URL "https://projects.kde.org/kfilemetadata"
                        TYPE OPTIONAL
 set_package_properties(KF5FileMetaData PROPERTIES
                        URL "https://projects.kde.org/kfilemetadata"
                        TYPE OPTIONAL