From 61466d9ce80c224fcbd824382193d602505d17c1 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 24 Feb 2015 00:15:24 +0100 Subject: [PATCH] Add support for KFileMetaData Also fix installing the main view's QML file. --- CMakeLists.txt | 6 ++++++ src/CMakeLists.txt | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16f9c63..90d7dcd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,11 @@ find_package(KF5 ${KF5_VERSION} REQUIRED # DocTools # Disabled until manual's ready ) +# Not a framework yet, hence separate +find_package(KF5 "5.6.0" COMPONENTS + FileMetaData) + + include(ECMInstallIcons) include(KDEInstallDirs) include(KDECompilerSettings) @@ -45,6 +50,7 @@ include(FeatureSummary) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") set(CMAKE_INCLUDE_CURRENT_DIR ON) +set_package_properties(FileMetaData PROPERTIES TYPE OPTIONAL PURPOSE "Required for file tagging") # add_subdirectory( doc ) add_subdirectory( src ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6f61556..998c682 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -52,6 +52,12 @@ target_link_libraries(danbooru_client PUBLIC danbooru ) +if (KF5FileMetaData_FOUND) +add_definitions(-DWITH_KFILEMETADATA) +target_link_libraries(danbooru_client PUBLIC + KF5::FileMetaData) +endif() + install(TARGETS danbooru_client ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### @@ -59,5 +65,4 @@ install(TARGETS danbooru_client ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(PROGRAMS danbooru_client.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install(FILES danboorusettings.kcfg DESTINATION ${KCFG_INSTALL_DIR}) install(FILES danbooru-clientui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/danbooru-client) - - +install(FILES qml/danbooruimageview.qml DESTINATION ${DATA_INSTALL_DIR}/danbooru-client)