[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dolphin] /: Make KFileMetaData optional again
From:       Frank Reininghaus <frank78ac () googlemail ! com>
Date:       2016-02-17 21:17:20
Message-ID: E1aW9TM-0000du-Ok () scm ! kde ! org
[Download RAW message or body]

Git commit 6bc4f18f60f9acceb2b4a0338da35b1a04340a3f by Frank Reininghaus.
Committed on 17/02/2016 at 21:10.
Pushed by freininghaus into branch 'master'.

Make KFileMetaData optional again

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

M  +1    -2    CMakeLists.txt

http://commits.kde.org/dolphin/6bc4f18f60f9acceb2b4a0338da35b1a04340a3f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a6fcce..c40020f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     WindowSystem
     Notifications
     Crash
-    FileMetaData
 )
 find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
     Activities
@@ -87,7 +86,7 @@ set_package_properties(KF5BalooWidgets PROPERTIES DESCRIP=
TION "Baloos Widgets"
                        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
[prev in list] [next in list] [prev in thread] [next in thread]