From dc1439deddaf1b5dbd5707c088fff5e0e62db966 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Fri, 18 Sep 2020 12:19:09 +0200
Subject: [PATCH] CMake build system: Propagate less target dependencies and
 includes

...and thereby have less include paths per compile unit.

Change-Id: I70de8db12d881ea827595ca0cacaea13b5c0f3bd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/3rdparty/syntax-highlighting/CMakeLists.txt | 3 ++-
 src/libs/cplusplus/CMakeLists.txt                    | 4 ++--
 src/libs/qmljs/CMakeLists.txt                        | 4 ++--
 src/libs/utils/CMakeLists.txt                        | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
index ca0a0391060..b2020ff065c 100644
--- a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
+++ b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_qtc_library(KSyntaxHighlighting SHARED
-  PUBLIC_INCLUDES autogenerated/ autogenerated/src/lib src/lib
+  INCLUDES autogenerated/
+  PUBLIC_INCLUDES src/lib autogenerated/src/lib
   DEFINES KSYNTAXHIGHLIGHTING_LIBRARY
   DEPENDS Qt5::Network Qt5::Widgets
   SOURCES
diff --git a/src/libs/cplusplus/CMakeLists.txt b/src/libs/cplusplus/CMakeLists.txt
index afeec6c7e74..829534acd40 100644
--- a/src/libs/cplusplus/CMakeLists.txt
+++ b/src/libs/cplusplus/CMakeLists.txt
@@ -3,9 +3,9 @@
 # TODO: Make Qt5::Gui optional -- if really needed that is.
 
 add_qtc_library(CPlusPlus
-  DEPENDS Utils
+  DEPENDS Utils Qt5::Concurrent
   DEFINES CPLUSPLUS_BUILD_LIB
-  PUBLIC_DEPENDS 3rd_cplusplus Qt5::Concurrent Qt5::Gui
+  PUBLIC_DEPENDS 3rd_cplusplus Qt5::Gui
   PUBLIC_INCLUDES src/libs/3rdparty
   SOURCES
     ASTParent.cpp ASTParent.h
diff --git a/src/libs/qmljs/CMakeLists.txt b/src/libs/qmljs/CMakeLists.txt
index 243966afdad..ebb985daf87 100644
--- a/src/libs/qmljs/CMakeLists.txt
+++ b/src/libs/qmljs/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_library(QmlJS
-  DEPENDS ExtensionSystem Utils
-  PUBLIC_DEPENDS CPlusPlus Qt5::Widgets Qt5::Xml LanguageUtils
+  DEPENDS ExtensionSystem Utils Qt5::Xml
+  PUBLIC_DEPENDS CPlusPlus Qt5::Widgets LanguageUtils
   SOURCES
     jsoncheck.cpp jsoncheck.h
     parser/qmldirparser.cpp parser/qmldirparser_p.h
diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index 7ee89455e30..4bfb447cb9e 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_qtc_library(Utils
-  DEPENDS Qt5::Xml
+  DEPENDS Qt5::Qml Qt5::Xml
   PUBLIC_DEPENDS
-    Qt5::Concurrent Qt5::Core Qt5::Network Qt5::Qml Qt5::Gui Qt5::Widgets
+    Qt5::Concurrent Qt5::Core Qt5::Network Qt5::Gui Qt5::Widgets
     Qt6Core5Compat
   DEFINES
     "QTC_REL_TOOLS_PATH=\"${RELATIVE_LIBEXEC_PATH}\""