alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up target_link_libraries for KF5Plasma

Browse Source 
It is now a single call using PUBLIC and PRIVATE keywords.  This removes
a CMake warning about using LINK_INTERFACE_LIBRARIES.

REVIEW: 114683
This commit is contained in:
Alex Merry 2013-12-27 13:46:45 +00:00
parent beeb20089e
commit 778bf0ac0b
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/plasma/CMakeLists.txt
View File

@ -114,7 +114,20 @@ kconfig_add_kcfg_files(Plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcf
add_library(KF5Plasma ${Plasma_LIB_SRCS}) add_library(KF5Plasma ${Plasma_LIB_SRCS})
add_library(KF5::Plasma ALIAS KF5Plasma) add_library(KF5::Plasma ALIAS KF5Plasma)
if(X11_FOUND)
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} Qt5::X11Extras ${X11_LIBRARIES})
endif()
if(DL_LIBRARY)
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${DL_LIBRARY})
endif()
target_link_libraries(KF5Plasma target_link_libraries(KF5Plasma
PUBLIC
Qt5::Widgets
KF5::ConfigWidgets
KF5::Service # For kplugininfo.h and kservice.h
PRIVATE
Qt5::Network Qt5::Network
Qt5::Sql Qt5::Sql
Qt5::Quick # needed in service.cpp, remove? Qt5::Quick # needed in service.cpp, remove?
@ -126,7 +139,6 @@ target_link_libraries(KF5Plasma
KF5::GuiAddons KF5::GuiAddons
KF5::IconThemes KF5::IconThemes
KF5::I18n KF5::I18n
KF5::Service # For kplugininfo.h
KF5::KIOCore KF5::KIOCore
KF5::KIOWidgets KF5::KIOWidgets
KF5::ThreadWeaver KF5::ThreadWeaver
@ -134,22 +146,12 @@ target_link_libraries(KF5Plasma
KF5::Auth KF5::Auth
KF5::Declarative KF5::Declarative
KF5::XmlGui KF5::XmlGui
KF5::ConfigWidgets
KF5::GlobalAccel KF5::GlobalAccel
KF5::DNSSD KF5::DNSSD
KF5::KDE4Support #ksharedptr KF5::KDE4Support #ksharedptr
${PLASMA_EXTRA_LIBS} ${PLASMA_EXTRA_LIBS}
) )
if(X11_FOUND)
target_link_libraries(KF5Plasma Qt5::X11Extras ${X11_LIBRARIES})
endif()
if(DL_LIBRARY)
target_link_libraries(KF5Plasma ${DL_LIBRARY})
endif()
target_link_libraries(KF5Plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::ConfigWidgets)
target_include_directories(KF5Plasma PUBLIC target_include_directories(KF5Plasma PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..;${CMAKE_CURRENT_SOURCE_DIR}/includes>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..;${CMAKE_CURRENT_SOURCE_DIR}/includes>"
) )