diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,12 @@ 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) set_package_properties(KF5ActivitiesStats PROPERTIES PURPOSE "Provides the recentlyused:/ kioslave." @@ -141,7 +147,7 @@ add_subdirectory( doc ) add_subdirectory( about ) -if(KF5Activities_FOUND) +if(TARGET KF5::Activities AND TARGET Qt5::Sql) add_subdirectory( activities ) endif() if(KF5ActivitiesStats_FOUND) diff --git a/activities/CMakeLists.txt b/activities/CMakeLists.txt --- a/activities/CMakeLists.txt +++ b/activities/CMakeLists.txt @@ -7,9 +7,6 @@ ${CMAKE_CURRENT_BINARY_DIR} ) -find_package (Qt5 REQUIRED NO_MODULE COMPONENTS Sql) -find_package (KF5 REQUIRED COMPONENTS KIO I18n Activities) - add_subdirectory(fileitemplugin) ########### next target ############### diff --git a/activities/fileitemplugin/CMakeLists.txt b/activities/fileitemplugin/CMakeLists.txt --- a/activities/fileitemplugin/CMakeLists.txt +++ b/activities/fileitemplugin/CMakeLists.txt @@ -1,13 +1,5 @@ # 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 FileItemLinkingPlugin.cpp FileItemLinkingPluginActionLoader.cpp