feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake build system: Propagate less target dependencies and includes

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

Change-Id: I70de8db12d881ea827595ca0cacaea13b5c0f3bd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2020-09-18 12:19:09 +02:00
parent de580388bb
commit dc1439dedd
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/3rdparty/syntax-highlighting/CMakeLists.txt vendored
View File

@@ -1,5 +1,6 @@
add_qtc_library(KSyntaxHighlighting SHARED 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 DEFINES KSYNTAXHIGHLIGHTING_LIBRARY
DEPENDS Qt5::Network Qt5::Widgets DEPENDS Qt5::Network Qt5::Widgets
SOURCES SOURCES

4
src/libs/cplusplus/CMakeLists.txt
View File

@@ -3,9 +3,9 @@
# TODO: Make Qt5::Gui optional -- if really needed that is. # TODO: Make Qt5::Gui optional -- if really needed that is.
add_qtc_library(CPlusPlus add_qtc_library(CPlusPlus
DEPENDS Utils DEPENDS Utils Qt5::Concurrent
DEFINES CPLUSPLUS_BUILD_LIB DEFINES CPLUSPLUS_BUILD_LIB
PUBLIC_DEPENDS 3rd_cplusplus Qt5::Concurrent Qt5::Gui PUBLIC_DEPENDS 3rd_cplusplus Qt5::Gui
PUBLIC_INCLUDES src/libs/3rdparty PUBLIC_INCLUDES src/libs/3rdparty
SOURCES SOURCES
ASTParent.cpp ASTParent.h ASTParent.cpp ASTParent.h

4
src/libs/qmljs/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_library(QmlJS add_qtc_library(QmlJS
DEPENDS ExtensionSystem Utils DEPENDS ExtensionSystem Utils Qt5::Xml
PUBLIC_DEPENDS CPlusPlus Qt5::Widgets Qt5::Xml LanguageUtils PUBLIC_DEPENDS CPlusPlus Qt5::Widgets LanguageUtils
SOURCES SOURCES
jsoncheck.cpp jsoncheck.h jsoncheck.cpp jsoncheck.h
parser/qmldirparser.cpp parser/qmldirparser_p.h parser/qmldirparser.cpp parser/qmldirparser_p.h

4
src/libs/utils/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
add_qtc_library(Utils add_qtc_library(Utils
DEPENDS Qt5::Xml DEPENDS Qt5::Qml Qt5::Xml
PUBLIC_DEPENDS 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 Qt6Core5Compat
DEFINES DEFINES
"QTC_REL_TOOLS_PATH=\"${RELATIVE_LIBEXEC_PATH}\"" "QTC_REL_TOOLS_PATH=\"${RELATIVE_LIBEXEC_PATH}\""