Move declarativeplugin to top-level dir

Summary: It's not only used by the plasmoid any more but also SFOS and the app use it.

Test Plan: Builds, App runs fine

Reviewers: #kde_connect, piggz, apol

Reviewed By: #kde_connect, piggz, apol

Subscribers: piggz, kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D14567
This commit is contained in:
Nicolas Fella 2018-08-02 22:53:23 +02:00
parent 8b93395128
commit d9f427aaeb
11 changed files with 4 additions and 10 deletions

View file

@ -70,10 +70,8 @@ if(NOT SAILFISHOS)
add_subdirectory(daemon) add_subdirectory(daemon)
endif() endif()
if(NOT WIN32) if(NOT WIN32 AND NOT SAILFISHOS)
if (NOT SAILFISHOS)
add_subdirectory(kio) add_subdirectory(kio)
endif()
add_subdirectory(plasmoid) add_subdirectory(plasmoid)
endif() endif()
@ -86,6 +84,7 @@ if(EXPERIMENTALAPP_ENABLED)
endif() endif()
add_subdirectory(plugins) add_subdirectory(plugins)
add_subdirectory(cli) add_subdirectory(cli)
add_subdirectory(declarativeplugin)
if (NOT SAILFISHOS) if (NOT SAILFISHOS)
add_subdirectory(indicator) add_subdirectory(indicator)

View file

@ -1,11 +1,6 @@
add_subdirectory(declarativeplugin)
if (NOT SAILFISHOS)
install(DIRECTORY package/ install(DIRECTORY package/
DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.kdeconnect) DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.kdeconnect)
install(FILES package/metadata.desktop install(FILES package/metadata.desktop
DESTINATION ${SERVICES_INSTALL_DIR} DESTINATION ${SERVICES_INSTALL_DIR}
RENAME plasma-kdeconnect.desktop) RENAME plasma-kdeconnect.desktop)
endif()