From 6b74af8a9018be2a0d4ed4024866c5606c860335 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Fri, 12 Jan 2018 05:23:12 +0100 Subject: [PATCH] Improve linking interface metadata of libplasmaweatherprivate --- applets/weather/CMakeLists.txt | 5 +---- libs/plasmaweather/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/applets/weather/CMakeLists.txt b/applets/weather/CMakeLists.txt index 68de0900e..f8bf07f75 100644 --- a/applets/weather/CMakeLists.txt +++ b/applets/weather/CMakeLists.txt @@ -1,9 +1,5 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.weather\") -include_directories( - ${CMAKE_SOURCE_DIR}/libs -) - set(weatherapplet_SRCS weatherapplet.cpp) @@ -16,6 +12,7 @@ target_link_libraries(plasma_applet_weather KF5::Plasma KF5::UnitConversion KF5::IconThemes + KF5::I18n ) install(TARGETS plasma_applet_weather DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/applets) diff --git a/libs/plasmaweather/CMakeLists.txt b/libs/plasmaweather/CMakeLists.txt index ab4f374d9..93be061ec 100644 --- a/libs/plasmaweather/CMakeLists.txt +++ b/libs/plasmaweather/CMakeLists.txt @@ -22,8 +22,10 @@ add_library(plasmaweather SHARED ${plasmaweather_LIB_SRCS}) generate_export_header(plasmaweather) target_link_libraries(plasmaweather +PUBLIC KF5::Plasma KF5::UnitConversion +PRIVATE KF5::WidgetsAddons KF5::Notifications KF5::I18n @@ -31,6 +33,7 @@ target_link_libraries(plasmaweather set_target_properties(plasmaweather PROPERTIES OUTPUT_NAME plasmaweatherprivate ) +target_include_directories(plasmaweather INTERFACE "$") install(TARGETS plasmaweather ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) # nothing outside of kdeplasma-addons uses this library, and the API is not stable -> do not install headers! -- GitLab