Consistent use of build options for non-build.sh based builds

This commit is contained in:
Matthias Koefferlein 2021-11-11 20:51:27 +01:00
parent 01d7600b87
commit 8cd39b2140
3 changed files with 15 additions and 13 deletions

View File

@ -9,27 +9,27 @@ SUBDIRS = \
QtGui.depends += QtCore QtGui.depends += QtCore
equals(HAVE_QT_NETWORK, "1") { !equals(HAVE_QT_NETWORK, "0") {
SUBDIRS += QtNetwork SUBDIRS += QtNetwork
QtNetwork.depends += QtCore QtNetwork.depends += QtCore
} }
equals(HAVE_QT_SQL, "1") { !equals(HAVE_QT_SQL, "0") {
SUBDIRS += QtSql SUBDIRS += QtSql
QtSql.depends += QtCore QtSql.depends += QtCore
} }
equals(HAVE_QT_DESIGNER, "1") { !equals(HAVE_QT_DESIGNER, "0") {
SUBDIRS += QtDesigner SUBDIRS += QtDesigner
QtDesigner.depends += QtCore QtDesigner.depends += QtCore
} }
equals(HAVE_QT_XML, "1") { !equals(HAVE_QT_XML, "0") {
SUBDIRS += QtXml SUBDIRS += QtXml
QtXml.depends += QtCore QtXml.depends += QtCore
} }
equals(HAVE_QT_UITOOLS, "1") { !equals(HAVE_QT_UITOOLS, "0") {
SUBDIRS += QtUiTools SUBDIRS += QtUiTools
QtUiTools.depends += QtCore QtUiTools.depends += QtCore
} }

View File

@ -11,43 +11,43 @@ SUBDIRS = \
QtGui.depends += QtCore QtGui.depends += QtCore
QtWidgets.depends += QtGui QtWidgets.depends += QtGui
equals(HAVE_QT_NETWORK, "1") { !equals(HAVE_QT_NETWORK, "0") {
SUBDIRS += QtNetwork SUBDIRS += QtNetwork
QtNetwork.depends += QtCore QtNetwork.depends += QtCore
} }
equals(HAVE_QT_SQL, "1") { !equals(HAVE_QT_SQL, "0") {
SUBDIRS += QtSql SUBDIRS += QtSql
QtSql.depends += QtCore QtSql.depends += QtCore
} }
equals(HAVE_QT_SVG, "1") { !equals(HAVE_QT_SVG, "0") {
SUBDIRS += QtSvg SUBDIRS += QtSvg
QtSvg.depends += QtCore QtWidgets QtSvg.depends += QtCore QtWidgets
} }
equals(HAVE_QT_PRINTSUPPORT, "1") { !equals(HAVE_QT_PRINTSUPPORT, "0") {
SUBDIRS += QtPrintSupport SUBDIRS += QtPrintSupport
QtPrintSupport.depends += QtCore QtWidgets QtPrintSupport.depends += QtCore QtWidgets
} }
equals(HAVE_QT_MULTIMEDIA, "1") { !equals(HAVE_QT_MULTIMEDIA, "0") {
SUBDIRS += QtMultimedia SUBDIRS += QtMultimedia
QtMultimedia.depends += QtCore QtWidgets QtNetwork QtMultimedia.depends += QtCore QtWidgets QtNetwork
} }
equals(HAVE_QT_DESIGNER, "1") { !equals(HAVE_QT_DESIGNER, "0") {
SUBDIRS += QtDesigner SUBDIRS += QtDesigner
QtDesigner.depends += QtCore QtDesigner.depends += QtCore
} }
equals(HAVE_QT_XML, "1") { !equals(HAVE_QT_XML, "0") {
SUBDIRS += QtXml QtXmlPatterns SUBDIRS += QtXml QtXmlPatterns
QtXmlPatterns.depends += QtCore QtXmlPatterns.depends += QtCore
QtXml.depends += QtCore QtXml.depends += QtCore
} }
equals(HAVE_QT_UITOOLS, "1") { !equals(HAVE_QT_UITOOLS, "0") {
SUBDIRS += QtUiTools SUBDIRS += QtUiTools
QtUiTools.depends += QtCore QtUiTools.depends += QtCore
} }

View File

@ -94,7 +94,9 @@ plugins.depends += lib rdb db
ant.depends += laybasic ant.depends += laybasic
img.depends += laybasic img.depends += laybasic
edt.depends += laybasic edt.depends += laybasic
lay.depends += laybasic ant img edt lay.depends += laybasic ant img edt
klayout_main.depends += plugins $$MAIN_DEPENDS klayout_main.depends += plugins $$MAIN_DEPENDS
} }