From b4bf8da259edd4c793ca2c7c450ec4cbdea32e29 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 8 Feb 2013 12:00:33 +0100 Subject: [PATCH] try to use ${KDE4_KDECORE_LIBS} in libplasma --- plasma/CMakeLists.txt | 2 +- shell/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt index 8bf718d32..eab567081 100644 --- a/plasma/CMakeLists.txt +++ b/plasma/CMakeLists.txt @@ -194,7 +194,7 @@ if(DL_LIBRARY) target_link_libraries(plasma ${DL_LIBRARY}) endif(DL_LIBRARY) -target_link_libraries(plasma LINK_INTERFACE_LIBRARIES kdecore Qt5::Widgets) +target_link_libraries(plasma LINK_INTERFACE_LIBRARIES ${KDE4_KDECORE_LIBS} Qt5::Widgets) #do NOT use GENERIC versioning -- the plasma team will take care of versioning set_target_properties(plasma PROPERTIES diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt index 91711946c..2b6ab71a3 100644 --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -20,6 +20,7 @@ find_package(Qt5Transitional REQUIRED Core) find_package(Qt5Qml REQUIRED) find_package(Qt5Quick REQUIRED) + # The Qt5Widgets_INCLUDES also includes the include directories for # dependencies QtCore and QtGui include_directories(${Qt5Widgets_DEFINITIONS} ${Qt5Quick_DEFINITIONS} ${QT_INCLUDES} ${KDE4_INCLUDES}) @@ -43,7 +44,6 @@ target_link_libraries(testplasma2 ${Qt5Quick_LIBRARIES} ${Qt5Qml_LIBRARIES} ${KDE4_KDECORE_LIBS} - kdecore plasma )