diff --git a/discover/CMakeLists.txt b/discover/CMakeLists.txt index 0e83b10b..8039728c 100644 --- a/discover/CMakeLists.txt +++ b/discover/CMakeLists.txt @@ -1,33 +1,34 @@ add_subdirectory(icons) add_subdirectory(autotests) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/..) set(plasma_discover_SRCS main.cpp MuonDiscoverMainWindow.cpp PaginateModel.cpp SystemFonts.cpp IconColors.cpp ) qt5_add_resources(plasma_discover_SRCS resources.qrc) add_executable(plasma-discover ${plasma_discover_SRCS}) add_executable(Plasma::Discover ALIAS plasma-discover) +set_target_properties(plasma-discover PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover) target_link_libraries(plasma-discover LINK_PUBLIC KF5::DBusAddons KF5::I18n KF5::XmlGui KF5::Declarative Qt5::Quick Discover::Common ) install(TARGETS plasma-discover ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(PROGRAMS org.kde.discover.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install(FILES featured.json DESTINATION ${DATA_INSTALL_DIR}/plasmadiscover) install(FILES plasmadiscoverui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/plasmadiscover) diff --git a/exporter/CMakeLists.txt b/exporter/CMakeLists.txt index 455c0675..42a219d6 100644 --- a/exporter/CMakeLists.txt +++ b/exporter/CMakeLists.txt @@ -1,9 +1,10 @@ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) add_executable(plasma-discover-exporter main.cpp MuonExporter.cpp) +set_target_properties(plasma-discover-exporter PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover) target_link_libraries(plasma-discover-exporter Discover::Common KF5::CoreAddons KF5::I18n) if(MUON_INSTALL_EXPORTER) install(TARGETS plasma-discover-exporter ${INSTALL_TARGETS_DEFAULT_ARGS}) endif() diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt index f2a682d4..bda6c5a8 100644 --- a/libdiscover/CMakeLists.txt +++ b/libdiscover/CMakeLists.txt @@ -1,57 +1,57 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libdiscover\") add_subdirectory(backends) add_subdirectory(declarative) add_subdirectory(notifiers) set(discovercommon_SRCS Category/Category.cpp Category/CategoryModel.cpp Category/CategoriesReader.cpp ReviewsBackend/AbstractReviewsBackend.cpp ReviewsBackend/Rating.cpp ReviewsBackend/Review.cpp ReviewsBackend/AbstractLoginBackend.cpp ReviewsBackend/ReviewsModel.cpp Transaction/AddonList.cpp Transaction/Transaction.cpp Transaction/TransactionListener.cpp Transaction/TransactionModel.cpp UpdateModel/UpdateItem.cpp UpdateModel/UpdateModel.cpp resources/ResourcesModel.cpp resources/ResourcesProxyModel.cpp resources/PackageState.cpp resources/ResourcesUpdatesModel.cpp resources/StandardBackendUpdater.cpp resources/SourcesModel.cpp resources/AbstractResourcesBackend.cpp resources/AbstractResource.cpp resources/AbstractBackendUpdater.cpp resources/AbstractSourcesBackend.cpp MessageActionsModel DiscoverBackendsFactory.cpp ScreenshotsModel.cpp ApplicationAddonsModel.cpp ) kconfig_add_kcfg_files(discovercommon_SRCS GENERATE_MOC MuonDataSources.kcfgc) add_library(DiscoverCommon ${discovercommon_SRCS}) target_link_libraries(DiscoverCommon LINK_PUBLIC Qt5::Core Qt5::Widgets KF5::I18n LINK_PRIVATE Qt5::Xml KF5::XmlGui ) add_library(Discover::Common ALIAS DiscoverCommon) generate_export_header(DiscoverCommon) target_include_directories(DiscoverCommon PRIVATE ${PHONON_INCLUDES} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -install(TARGETS DiscoverCommon ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS DiscoverCommon DESTINATION ${CMAKE_INSTALL_LIBDIR}/plasma-discover) install(FILES resources/discoverabstractnotifier.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR}) diff --git a/updater/CMakeLists.txt b/updater/CMakeLists.txt index ad668603..0a1f444d 100644 --- a/updater/CMakeLists.txt +++ b/updater/CMakeLists.txt @@ -1,37 +1,37 @@ include_directories(../libdiscover) set(plasmadiscover_updater_SRCS main.cpp MainWindow.cpp ChangelogWidget.cpp ProgressWidget.cpp UpdaterWidget.cpp KActionMessageWidget.cpp UIHelper.cpp UpdateDelegate.cpp ) ki18n_wrap_ui(plasmadiscover_updater_SRCS ProgressWidget.ui UpdaterCentralWidget.ui UpdaterWidgetNoUpdates.ui ) add_executable(plasma-discover-updater ${plasmadiscover_updater_SRCS}) +set_target_properties(plasma-discover-updater PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover) target_link_libraries(plasma-discover-updater KF5::CoreAddons KF5::I18n KF5::DBusAddons KF5::XmlGui Discover::Common) if (ENABLE_QZEITGEIST) target_link_libraries(plasma-discover-updater ${QZEITGEIST_LIBRARY}) endif () install(TARGETS plasma-discover-updater ${INSTALL_TARGETS_DEFAULT_ARGS} ) ########### install files ############### install( FILES plasmadiscoverupdaterui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/plasmadiscoverupdater ) install( PROGRAMS plasma-discover-updater.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -