[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] libksysguard: Fix build of libksysguard when Qt5WebKitWidgets is available
From:       Alex Merry <alex.merry () kde ! org>
Date:       2014-03-24 17:31:58
Message-ID: E1WS8j8-00079t-NS () scm ! kde ! org
[Download RAW message or body]

Git commit 99f0cd5963b834840ea3d8ba82ad29042eb9122e by Alex Merry.
Committed on 24/03/2014 at 17:31.
Pushed by alexmerry into branch 'master'.

Fix build of libksysguard when Qt5WebKitWidgets is available

M  +16   -7    libksysguard/processui/CMakeLists.txt
M  +1    -1    libksysguard/processui/ProcessModel.h
M  +1    -1    libksysguard/processui/ProcessModel_p.h
M  +1    -1    libksysguard/processui/ksysguardprocesslist.h
M  +1    -1    libksysguard/processui/scripting.h
M  +1    -1    libksysguard/tests/CMakeLists.txt

http://commits.kde.org/kde-workspace/99f0cd5963b834840ea3d8ba82ad29042eb912=
2e

diff --git a/libksysguard/processui/CMakeLists.txt b/libksysguard/processui=
/CMakeLists.txt
index 8fd6e8a..675dc68 100644
--- a/libksysguard/processui/CMakeLists.txt
+++ b/libksysguard/processui/CMakeLists.txt
@@ -1,6 +1,4 @@
 =

-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../  ../processcore/)
-
 check_include_files(sys/endian.h HAVE_SYS_ENDIAN_H)
 check_include_files(byteswap.h HAVE_BYTESWAP_H)
 =

@@ -24,15 +22,26 @@ add_library(processui ${processui_LIB_SRCS})
 add_library(KF5::ProcessUi ALIAS processui)
 =

 if(X11_XRes_FOUND)
-  target_link_libraries(processui ${X11_XRes_LIB} ${X11_LIBRARIES})
-  include_directories(${X11_XRes_INCLUDE_PATH})
+    target_link_libraries(processui PRIVATE ${X11_XRes_LIB} ${X11_LIBRARIE=
S})
+    include_directories(${X11_XRes_INCLUDE_PATH})
 endif()
 =

-target_link_libraries(processui Qt5::Script Qt5::WebKitWidgets KF5::KDE4Su=
pport processcore)
-# target_link_libraries(processui LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LI=
BS} processcore)
+target_link_libraries(processui
+    # FIXME: make some of these private?
+    PUBLIC
+        Qt5::Script
+        Qt5::WebKitWidgets
+        KF5::KDE4Support
+        processcore
+)
+target_include_directories(processui
+    PUBLIC
+        "$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>"
+        "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/ksysguard>"
+)
 =

 if(X11_FOUND)
-    target_link_libraries(processui Qt5::X11Extras KF5::WindowSystem)
+    target_link_libraries(processui PRIVATE Qt5::X11Extras KF5::WindowSyst=
em)
 endif()
 =

 set_target_properties(processui
diff --git a/libksysguard/processui/ProcessModel.h b/libksysguard/processui=
/ProcessModel.h
index 6eb7d8d..f02ef53 100644
--- a/libksysguard/processui/ProcessModel.h
+++ b/libksysguard/processui/ProcessModel.h
@@ -27,7 +27,7 @@
 #include <QAbstractItemModel>
 =

 #include <kdemacros.h>
-#include "processes.h"
+#include <processcore/processes.h>
 =

 namespace KSysGuard {
 	class Processes;
diff --git a/libksysguard/processui/ProcessModel_p.h b/libksysguard/process=
ui/ProcessModel_p.h
index d3b5f2e..6bc9d09 100644
--- a/libksysguard/processui/ProcessModel_p.h
+++ b/libksysguard/processui/ProcessModel_p.h
@@ -22,7 +22,7 @@
 #ifndef PROCESSMODEL_P_H_
 #define PROCESSMODEL_P_H_
 =

-#include "processcore/process.h"
+#include <processcore/process.h>
 #include "ProcessModel.h"
 =

 #include <kapplication.h>
diff --git a/libksysguard/processui/ksysguardprocesslist.h b/libksysguard/p=
rocessui/ksysguardprocesslist.h
index a3b04c5..ce469d5 100644
--- a/libksysguard/processui/ksysguardprocesslist.h
+++ b/libksysguard/processui/ksysguardprocesslist.h
@@ -29,7 +29,7 @@
 #include <kapplication.h>
 #include "ProcessModel.h"
 #include "ProcessFilter.h"
-#include "processes.h"
+#include <processcore/processes.h>
 =

 class QShowEvent;
 class QHideEvent;
diff --git a/libksysguard/processui/scripting.h b/libksysguard/processui/sc=
ripting.h
index 0b65273..2445c0a 100644
--- a/libksysguard/processui/scripting.h
+++ b/libksysguard/processui/scripting.h
@@ -26,7 +26,7 @@
 #include <QList>
 #include <QString>
 #include <QWidget>
-#include "processes.h"
+#include <processcore/processes.h>
 #include "ProcessModel.h"
 =

 class QAction;
diff --git a/libksysguard/tests/CMakeLists.txt b/libksysguard/tests/CMakeLi=
sts.txt
index daa9409..1826b21 100644
--- a/libksysguard/tests/CMakeLists.txt
+++ b/libksysguard/tests/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(${libksysguard_SOURCE_DIR})
 if(Qt5WebKitWidgets_FOUND)
     # Process unit test
     ecm_add_test(processtest.cpp TEST_NAME processtest
-                 LINK_LIBRARIES KF5::ProcessUi Qt5::Test)
+            LINK_LIBRARIES KF5::KDE4Support KF5::ProcessUi Qt5::Test)
 endif()
 =

 ecm_add_test(signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp
[prev in list] [next in list] [prev in thread] [next in thread]