Commit 839fe1b5 authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Only build activities support if QtSQL is found

Summary: Check if QtSql is found before including the activities directory. Drop unneeded find_package calls

Test Plan: builds

Reviewers: #frameworks, apol

Reviewed By: apol

Subscribers: apol, kde-frameworks-devel, kfm-devel

Tags: #dolphin, #frameworks

Differential Revision: https://phabricator.kde.org/D25528
parent f5b426a7
...@@ -65,6 +65,12 @@ set_package_properties(KF5Activities PROPERTIES ...@@ -65,6 +65,12 @@ set_package_properties(KF5Activities PROPERTIES
TYPE OPTIONAL TYPE OPTIONAL
) )
find_package(Qt5Sql QUIET)
set_package_properties(Qt5Sql PROPERTIES
PURPOSE "Provides the activities:/ kioslave and fileitem plugin."
TYPE OPTIONAL
)
find_package(KF5ActivitiesStats 5.62 QUIET) find_package(KF5ActivitiesStats 5.62 QUIET)
set_package_properties(KF5ActivitiesStats PROPERTIES set_package_properties(KF5ActivitiesStats PROPERTIES
PURPOSE "Provides the recentlyused:/ kioslave." PURPOSE "Provides the recentlyused:/ kioslave."
...@@ -141,7 +147,7 @@ endif() ...@@ -141,7 +147,7 @@ endif()
add_subdirectory( doc ) add_subdirectory( doc )
add_subdirectory( about ) add_subdirectory( about )
if(KF5Activities_FOUND) if(TARGET KF5::Activities AND TARGET Qt5::Sql)
add_subdirectory( activities ) add_subdirectory( activities )
endif() endif()
if(KF5ActivitiesStats_FOUND) if(KF5ActivitiesStats_FOUND)
......
...@@ -7,9 +7,6 @@ include_directories ( ...@@ -7,9 +7,6 @@ include_directories (
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Sql)
find_package (KF5 REQUIRED COMPONENTS KIO I18n Activities)
add_subdirectory(fileitemplugin) add_subdirectory(fileitemplugin)
########### next target ############### ########### next target ###############
......
# vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab: # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab:
find_package (KF5 REQUIRED COMPONENTS KIO Activities)
find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Sql)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
set (kactivitymanagerd_fileitem_linking_plugin_SRCS set (kactivitymanagerd_fileitem_linking_plugin_SRCS
FileItemLinkingPlugin.cpp FileItemLinkingPlugin.cpp
FileItemLinkingPluginActionLoader.cpp FileItemLinkingPluginActionLoader.cpp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment