Rework cmake find calls

This commit is contained in:
Nicolas Fella 2019-10-27 17:02:45 +01:00
parent 0836195f4b
commit ae7a3693d5

View file

@ -41,12 +41,28 @@ if (SAILFISHOS)
include_directories(${QCA2_INCLUDEDIR}) include_directories(${QCA2_INCLUDEDIR})
add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
else() else()
set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service Kirigami2) set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service Kirigami2 People)
set(KF5_OPTIONAL_COMPONENTS DocTools) set(KF5_OPTIONAL_COMPONENTS DocTools)
set_package_properties(KF5Kirigami2 PROPERTIES
DESCRIPTION "QtQuick plugins to build user interfaces based on KDE UX guidelines"
PURPOSE "Required for KDE Connect's QML-based GUI applications"
URL "https://www.kde.org/products/kirigami/"
TYPE RUNTIME
)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} Runner) set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} Runner)
endif() endif()
find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED) find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED)
find_package(KF5PeopleVCard)
set_package_properties(KF5PeopleVCard PROPERTIES
PURPOSE "Read vcards from the file system"
URL "https://phabricator.kde.org/source/kpeoplevcard/"
TYPE RUNTIME
)
if(NOT WIN32 AND NOT APPLE) if(NOT WIN32 AND NOT APPLE)
find_package(KF5PulseAudioQt) find_package(KF5PulseAudioQt)
endif() endif()
@ -65,13 +81,6 @@ endif()
find_package(Qt5Multimedia) find_package(Qt5Multimedia)
set_package_properties(KF5Kirigami2 PROPERTIES
DESCRIPTION "QtQuick plugins to build user interfaces based on KDE UX guidelines"
PURPOSE "Required for KDE Connect's QML-based GUI applications"
URL "https://www.kde.org/products/kirigami/"
TYPE RUNTIME
)
option(PRIVATE_DBUS_ENABLED "Use private dbus session for kdeconnect" OFF) option(PRIVATE_DBUS_ENABLED "Use private dbus session for kdeconnect" OFF)
if(PRIVATE_DBUS_ENABLED OR APPLE) if(PRIVATE_DBUS_ENABLED OR APPLE)
add_compile_definitions(USE_PRIVATE_DBUS) add_compile_definitions(USE_PRIVATE_DBUS)
@ -87,7 +96,6 @@ if(NOT SAILFISHOS)
endif() endif()
endif() endif()
add_subdirectory(icon) add_subdirectory(icon)
add_subdirectory(interfaces) add_subdirectory(interfaces)
add_subdirectory(data) add_subdirectory(data)
@ -114,15 +122,6 @@ else()
add_subdirectory(sfos) add_subdirectory(sfos)
endif() endif()
find_package(KF5Kirigami2)
find_package(KF5People REQUIRED)
find_package(KF5PeopleVCard)
set_package_properties(KF5PeopleVCard PROPERTIES
PURPOSE "Read vcards from the file system"
URL "https://phabricator.kde.org/source/kpeoplevcard/"
TYPE RUNTIME
)
if(KF5DocTools_FOUND) if(KF5DocTools_FOUND)
add_subdirectory(doc) add_subdirectory(doc)
endif() endif()