File kdevplatform-reduce-dependencies.diff of Package kdevelop5

Overview Repositories Revisions Requests Users Attributes Meta

File kdevplatform-reduce-dependencies.diff of Package kdevelop5 (Revision a73eae8b54db5216c8e16ace7154fc52)

Currently displaying revision a73eae8b54db5216c8e16ace7154fc52 , Show latest

commit 86b746ce5325d351d64b83efb8472b0dcd05fdb8
Author: Friedrich W. H. Kossebau <kossebau@kde.org>
Date:   Tue Feb 20 20:37:49 2018 +0100

Clean up link interfaces of KDevPlatform libraries
    
    Test Plan:
    Created helper files including all headers per library and linking against
    the library to test which libs need to be in the public link interface.
    All normal & playground plugins still built against KDevPlatform.
    
    Reviewers: #kdevelop, apol
    
    Reviewed By: #kdevelop, apol
    
    Subscribers: apol, kdevelop-devel
    
    Differential Revision: https://phabricator.kde.org/D10696

diff --git a/kdevplatform/KDevPlatformConfig.cmake.in b/kdevplatform/KDevPlatformConfig.cmake.in
index 8905df8844..4d59596670 100644
--- a/kdevplatform/KDevPlatformConfig.cmake.in
+++ b/kdevplatform/KDevPlatformConfig.cmake.in
@@ -6,32 +6,9 @@ include("${CMAKE_CURRENT_LIST_DIR}/KDevPlatformMacros.cmake")
 
 include(CMakeFindDependencyMacro)
 
-find_dependency(Qt5Concurrent "@QT_MIN_VERSION@")
-find_dependency(Qt5Core "@QT_MIN_VERSION@")
-find_dependency(Qt5Quick "@QT_MIN_VERSION@")
-find_dependency(Qt5QuickWidgets "@QT_MIN_VERSION@")
 @KDEV_FIND_DEP_QT5TEST@
 
-find_dependency(KF5Archive "@KF5_DEP_VERSION@")
-find_dependency(KF5Config "@KF5_DEP_VERSION@")
-find_dependency(KF5ConfigWidgets "@KF5_DEP_VERSION@")
-find_dependency(KF5GuiAddons "@KF5_DEP_VERSION@")
-find_dependency(KF5I18n "@KF5_DEP_VERSION@")
-find_dependency(KF5IconThemes "@KF5_DEP_VERSION@")
-find_dependency(KF5ItemModels "@KF5_DEP_VERSION@")
-find_dependency(KF5ItemViews "@KF5_DEP_VERSION@")
-find_dependency(KF5JobWidgets "@KF5_DEP_VERSION@")
-find_dependency(KF5KCMUtils "@KF5_DEP_VERSION@")
-find_dependency(KF5KIO "@KF5_DEP_VERSION@")
-find_dependency(KF5NewStuff "@KF5_DEP_VERSION@")
-find_dependency(KF5Notifications "@KF5_DEP_VERSION@")
-find_dependency(KF5NotifyConfig "@KF5_DEP_VERSION@")
-find_dependency(KF5Parts "@KF5_DEP_VERSION@")
-find_dependency(KF5Service "@KF5_DEP_VERSION@")
 find_dependency(KF5TextEditor "@KF5_DEP_VERSION@")
 find_dependency(KF5ThreadWeaver "@KF5_DEP_VERSION@")
-find_dependency(KF5WindowSystem "@KF5_DEP_VERSION@")
-
-find_dependency(Grantlee5)
 
 include("${CMAKE_CURRENT_LIST_DIR}/KDevPlatformTargets.cmake")
diff --git a/kdevplatform/debugger/CMakeLists.txt b/kdevplatform/debugger/CMakeLists.txt
index 08881a1185..24b70c0504 100644
--- a/kdevplatform/debugger/CMakeLists.txt
+++ b/kdevplatform/debugger/CMakeLists.txt
@@ -27,14 +27,13 @@ ecm_qt_declare_logging_category(KDevPlatformDebugger_LIB_SRCS
 )
 kdevplatform_add_library(KDevPlatformDebugger SOURCES ${KDevPlatformDebugger_LIB_SRCS})
 target_link_libraries(KDevPlatformDebugger
-LINK_PUBLIC
+PUBLIC
     KDev::Interfaces
     KDev::Util
-LINK_PRIVATE
-    Qt5::Core
+PRIVATE
+    KDev::Sublime
     KF5::Notifications
     KF5::TextEditor
-    KDev::Sublime
 )
 
 install(FILES
diff --git a/kdevplatform/documentation/CMakeLists.txt b/kdevplatform/documentation/CMakeLists.txt
index 65b9414950..0f2419a028 100644
--- a/kdevplatform/documentation/CMakeLists.txt
+++ b/kdevplatform/documentation/CMakeLists.txt
@@ -30,7 +30,12 @@ ecm_qt_declare_logging_category(KDevPlatformDocumentation_LIB_SRCS
 ki18n_wrap_ui(KDevPlatformDocumentation_LIB_SRCS documentationfindwidget.ui)
 kdevplatform_add_library(KDevPlatformDocumentation SOURCES ${KDevPlatformDocumentation_LIB_SRCS})
 
-target_link_libraries(KDevPlatformDocumentation PUBLIC KDev::Interfaces PRIVATE KDev::Util)
+target_link_libraries(KDevPlatformDocumentation
+PUBLIC
+    KDev::Interfaces
+PRIVATE
+    KDev::Util
+)
 
 if(USE_QTWEBKIT)
     target_link_libraries(KDevPlatformDocumentation PRIVATE Qt5::WebKitWidgets)
diff --git a/kdevplatform/interfaces/CMakeLists.txt b/kdevplatform/interfaces/CMakeLists.txt
index 338dd84f1f..fd3f6200f6 100644
--- a/kdevplatform/interfaces/CMakeLists.txt
+++ b/kdevplatform/interfaces/CMakeLists.txt
@@ -49,13 +49,10 @@ configure_file(ipluginversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/ipluginversion.h)
 
 kdevplatform_add_library(KDevPlatformInterfaces SOURCES ${KDevPlatformInterfaces_LIB_SRCS})
 target_link_libraries(KDevPlatformInterfaces
-LINK_PUBLIC
-    KF5::Parts
+PUBLIC
     KF5::TextEditor
-LINK_PRIVATE
-    KF5::ConfigCore
+PRIVATE
     KF5::I18n
-    KF5::Service
 )
 
 install(FILES
diff --git a/kdevplatform/language/CMakeLists.txt b/kdevplatform/language/CMakeLists.txt
index 437dfb33ca..0d8d40055b 100644
--- a/kdevplatform/language/CMakeLists.txt
+++ b/kdevplatform/language/CMakeLists.txt
@@ -177,19 +177,20 @@ ki18n_wrap_ui(KDevPlatformLanguage_LIB_SRCS
 
 kdevplatform_add_library(KDevPlatformLanguage SOURCES ${KDevPlatformLanguage_LIB_SRCS})
 target_include_directories(KDevPlatformLanguage PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(KDevPlatformLanguage LINK_PUBLIC
-        KF5::ThreadWeaver
-        KDev::Interfaces
-        KDev::Serialization
-LINK_PRIVATE
-        Grantlee5::Templates
-        KF5::GuiAddons
-        KF5::TextEditor
-        KF5::Parts
-        KF5::Archive
-        KF5::IconThemes
-        KDev::Util
-        KDev::Project
+target_link_libraries(KDevPlatformLanguage
+PUBLIC
+    KDev::Serialization
+    KDev::Interfaces
+    KDev::Util
+    KF5::ThreadWeaver
+PRIVATE
+    KDev::Project
+    KF5::GuiAddons
+    KF5::TextEditor
+    KF5::Parts
+    KF5::Archive
+    KF5::IconThemes
+    Grantlee5::Templates
 )
 
 install(FILES
diff --git a/kdevplatform/outputview/CMakeLists.txt b/kdevplatform/outputview/CMakeLists.txt
index 5050d6be8c..1f56b5551f 100644
--- a/kdevplatform/outputview/CMakeLists.txt
+++ b/kdevplatform/outputview/CMakeLists.txt
@@ -18,8 +18,11 @@ ecm_qt_declare_logging_category(outputviewinterfaces_LIB_SRCS
     CATEGORY_NAME "kdevplatform.outputview"
 )
 kdevplatform_add_library(KDevPlatformOutputView SOURCES ${outputviewinterfaces_LIB_SRCS})
-target_link_libraries(KDevPlatformOutputView PRIVATE
-    Qt5::Core
+target_link_libraries(KDevPlatformOutputView
+PUBLIC
+    KF5::CoreAddons
+    Qt5::Widgets
+PRIVATE
     KDev::Interfaces
     KDev::Util
 )
diff --git a/kdevplatform/project/CMakeLists.txt b/kdevplatform/project/CMakeLists.txt
index c61e8de32e..93c528d9ce 100644
--- a/kdevplatform/project/CMakeLists.txt
+++ b/kdevplatform/project/CMakeLists.txt
@@ -27,13 +27,13 @@ ki18n_wrap_ui( KDevPlatformProject_LIB_SRCS widgets/dependencieswidget.ui)
 
 kdevplatform_add_library(KDevPlatformProject SOURCES ${KDevPlatformProject_LIB_SRCS})
 target_link_libraries(KDevPlatformProject
-LINK_PUBLIC
+PUBLIC
     KDev::Interfaces
     KDev::Util # util/path.h
-LINK_PRIVATE
+    KDev::Vcs
+PRIVATE
     KDev::Interfaces
     KDev::Serialization
-    KDev::Vcs
     KF5::KIOWidgets
     Qt5::Concurrent
 )
diff --git a/kdevplatform/serialization/CMakeLists.txt b/kdevplatform/serialization/CMakeLists.txt
index 83d6319..b1728dc 100644
--- a/kdevplatform/serialization/CMakeLists.txt
+++ b/kdevplatform/serialization/CMakeLists.txt
@@ -15,9 +15,9 @@ ecm_qt_declare_logging_category(KDevPlatformSerialization_LIB_SRCS
 
 kdevplatform_add_library(KDevPlatformSerialization SOURCES ${KDevPlatformSerialization_LIB_SRCS})
 target_link_libraries(KDevPlatformSerialization
-LINK_PUBLIC
+PUBLIC
     KDev::Interfaces
-LINK_PRIVATE
+PRIVATE
     KDev::Util
 )
 
diff --git a/kdevplatform/shell/CMakeLists.txt b/kdevplatform/shell/CMakeLists.txt
index ffda4dc4bd..1e9fdade50 100644
--- a/kdevplatform/shell/CMakeLists.txt
+++ b/kdevplatform/shell/CMakeLists.txt
@@ -128,13 +128,18 @@ ki18n_wrap_ui(KDevPlatformShell_LIB_SRCS
 qt5_add_resources(KDevPlatformShell_LIB_SRCS kdevplatformshell.qrc)
 kdevplatform_add_library(KDevPlatformShell SOURCES ${KDevPlatformShell_LIB_SRCS})
 target_link_libraries(KDevPlatformShell
-LINK_PUBLIC
-    KF5::XmlGui
-
+PUBLIC
     KDev::Sublime
     KDev::OutputView
     KDev::Interfaces
-LINK_PRIVATE
+    KDev::Language
+    KF5::XmlGui
+PRIVATE
+    KDev::Debugger
+    KDev::Project
+    KDev::Vcs
+    KDev::Util
+    KDev::Documentation
     KF5::GuiAddons
     KF5::ConfigWidgets
     KF5::IconThemes
@@ -150,13 +155,6 @@ LINK_PRIVATE
     KF5::KCMUtils #for KPluginSelector, not sure why it is in kcmutils
     KF5::NewStuff # template config page
     KF5::Archive # template config page
-
-    KDev::Debugger
-    KDev::Project
-    KDev::Vcs
-    KDev::Language
-    KDev::Util
-    KDev::Documentation
 )
 if(APPLE)
     target_link_libraries(KDevPlatformShell PRIVATE "-framework AppKit")
diff --git a/kdevplatform/sublime/CMakeLists.txt b/kdevplatform/sublime/CMakeLists.txt
index 5148529afa..53fe7681d7 100644
--- a/kdevplatform/sublime/CMakeLists.txt
+++ b/kdevplatform/sublime/CMakeLists.txt
@@ -34,8 +34,11 @@ ecm_qt_declare_logging_category(sublime_LIB_SRCS
 )
 kdevplatform_add_library(KDevPlatformSublime SOURCES ${sublime_LIB_SRCS})
 target_link_libraries(KDevPlatformSublime
-        LINK_PRIVATE KF5::KIOWidgets
-        LINK_PUBLIC KF5::Parts)
+PUBLIC
+    KF5::Parts
+PRIVATE
+    KF5::KIOWidgets
+)
 
 install(FILES
     area.h
diff --git a/kdevplatform/tests/CMakeLists.txt b/kdevplatform/tests/CMakeLists.txt
index 961d0cea96..79db345b19 100644
--- a/kdevplatform/tests/CMakeLists.txt
+++ b/kdevplatform/tests/CMakeLists.txt
@@ -19,14 +19,13 @@ set(kdevtests_LIB_SRCS
 )
 
 kdevplatform_add_library(KDevPlatformTests SOURCES ${kdevtests_LIB_SRCS})
-target_link_libraries(KDevPlatformTests LINK_PUBLIC
+target_link_libraries(KDevPlatformTests
+PUBLIC
     KDev::Shell
     KDev::Language
     KDev::Project
     KDev::Debugger
-)
-target_link_libraries(KDevPlatformTests LINK_PRIVATE
-    Qt5::Core
+PRIVATE
     Qt5::Test
 )
 
diff --git a/kdevplatform/util/CMakeLists.txt b/kdevplatform/util/CMakeLists.txt
index 728b8920a1..5fecb40d2b 100644
--- a/kdevplatform/util/CMakeLists.txt
+++ b/kdevplatform/util/CMakeLists.txt
@@ -53,10 +53,10 @@ ecm_qt_declare_logging_category(KDevPlatformUtil_LIB_SRCS
 ki18n_wrap_ui(KDevPlatformUtil_LIB_SRCS ${KDevPlatformUtil_LIB_US})
 kdevplatform_add_library(KDevPlatformUtil SOURCES ${KDevPlatformUtil_LIB_SRCS})
 target_link_libraries(KDevPlatformUtil
-LINK_PUBLIC
+PUBLIC
     KDev::Interfaces
     KF5::ItemModels
-LINK_PRIVATE
+PRIVATE
     KF5::ConfigWidgets
     KF5::TextEditor
     KF5::GuiAddons
diff --git a/kdevplatform/vcs/CMakeLists.txt b/kdevplatform/vcs/CMakeLists.txt
index 135129f5f0..36203f29aa 100644
--- a/kdevplatform/vcs/CMakeLists.txt
+++ b/kdevplatform/vcs/CMakeLists.txt
@@ -55,13 +55,13 @@ ecm_qt_declare_logging_category(KDevPlatformVcs_LIB_SRCS
 ki18n_wrap_ui(KDevPlatformVcs_LIB_SRCS ${KDevPlatformVcs_UIS})
 kdevplatform_add_library(KDevPlatformVcs SOURCES ${KDevPlatformVcs_LIB_SRCS})
 target_link_libraries(KDevPlatformVcs
-LINK_PUBLIC
+PUBLIC
     KDev::OutputView
     KDev::Interfaces
-LINK_PRIVATE
+PRIVATE
+    KDev::Util
     KF5::KIOWidgets
     KF5::Parts
-    KDev::Util
 )
 
 install(FILES

Places

File kdevplatform-reduce-dependencies.diff of Package kdevelop5 (Revision a73eae8b54db5216c8e16ace7154fc52)

Places