luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following: 

commit 2a8a2d228d
Author: Matthias Koefferlein <matthias@koefferlein.de>
Date:   Fri Feb 26 23:54:08 2021 +0100

    One more fix.

commit 8c4d76505c
Author: Matthias Koefferlein <matthias@koefferlein.de>
Date:   Fri Feb 26 23:03:07 2021 +0100

    More patches for uitools-less build for CentOS 8

commit 2ac28292b8
Author: Matthias Koefferlein <matthias@koefferlein.de>
Date:   Fri Feb 26 22:52:27 2021 +0100

    First steps for fixing build on CentOS 8 without uitools
This commit is contained in:
Matthias Koefferlein 2021-02-26 23:59:23 +01:00
parent f993c0397d
commit 9350b33bcb
8 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gsiqt/qt4/qt4.pro
View File

@ -7,12 +7,16 @@ SUBDIRS = \
QtXml \ QtXml \
QtSql \ QtSql \
QtNetwork \ QtNetwork \
QtDesigner \ QtDesigner
QtUiTools
QtGui.depends += QtCore QtGui.depends += QtCore
QtNetwork.depends += QtCore QtNetwork.depends += QtCore
QtSql.depends += QtCore QtSql.depends += QtCore
QtDesigner.depends += QtCore QtDesigner.depends += QtCore
QtXml.depends += QtCore QtXml.depends += QtCore
QtUiTools.depends += QtCore
contains(QT_MODULES, uitools) {
# Not all distributions have uitools
SUBDIRS += QtUiTools
QtUiTools.depends += QtCore
}

10
src/gsiqt/qt5/qt5.pro
View File

@ -12,8 +12,7 @@ SUBDIRS = \
QtPrintSupport \ QtPrintSupport \
QtSvg \ QtSvg \
QtXmlPatterns \ QtXmlPatterns \
QtXml \ QtXml
QtUiTools
QtGui.depends += QtCore QtGui.depends += QtCore
QtNetwork.depends += QtCore QtNetwork.depends += QtCore
@ -25,4 +24,9 @@ QtPrintSupport.depends += QtCore QtWidgets
QtSvg.depends += QtCore QtWidgets QtSvg.depends += QtCore QtWidgets
QtXmlPatterns.depends += QtCore QtXmlPatterns.depends += QtCore
QtXml.depends += QtCore QtXml.depends += QtCore
QtUiTools.depends += QtCore
contains(QT_MODULES, uitools) {
# Not all distributions have uitools
SUBDIRS += QtUiTools
QtUiTools.depends += QtCore
}

4
src/gsiqt/qtbasic/gsiQtUiToolsExternals.h
View File

@ -20,7 +20,9 @@
*/ */
#if QT_VERSION >= 0x050000 #if !defined(HAVE_QT_UITOOLS)
# defined FORCE_LINK_GSI_QTUITOOLS
#elif QT_VERSION >= 0x050000
# include "../qt5/QtUiTools/gsiQtExternals.h" # include "../qt5/QtUiTools/gsiQtExternals.h"
#else #else
# include "../qt4/QtUiTools/gsiQtExternals.h" # include "../qt4/QtUiTools/gsiQtExternals.h"

11
src/klayout.pri
View File

@ -163,15 +163,22 @@ equals(HAVE_QT, "0") {
QT += core network xml sql QT += core network xml sql
equals(HAVE_QT5, "1") { equals(HAVE_QT5, "1") {
QT += designer printsupport widgets uitools QT += designer printsupport widgets
contains(QT_MODULES, "uitools") {
# not all distributions have uitools
QT += uitools
}
equals(HAVE_QTBINDINGS, "1") { equals(HAVE_QTBINDINGS, "1") {
QT += multimedia multimediawidgets xmlpatterns svg gui QT += multimedia multimediawidgets xmlpatterns svg gui
} }
} else { } else {
# questionable: use uitools instead?
CONFIG += designer uitools CONFIG += designer uitools
} }
contains(QT_MODULES, "uitools") {
DEFINES += HAVE_QT_UITOOLS
}
} }
VERSION_STRING = $$KLAYOUT_VERSION VERSION_STRING = $$KLAYOUT_VERSION

5
src/klayout_main/klayout_main/klayout_main.pro
View File

@ -25,7 +25,10 @@ INCLUDEPATH += $$QTBASIC_INC
DEPENDPATH += $$QTBASIC_INC DEPENDPATH += $$QTBASIC_INC
equals(HAVE_QTBINDINGS, "1") { equals(HAVE_QTBINDINGS, "1") {
LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtXml -lklayout_QtNetwork -lklayout_QtSql -lklayout_QtDesigner -lklayout_QtUiTools LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtXml -lklayout_QtNetwork -lklayout_QtSql -lklayout_QtDesigner
contains(QT_MODULES, uitools) {
LIBS += -lklayout_QtUiTools
}
equals(HAVE_QT5, "1") { equals(HAVE_QT5, "1") {
LIBS += -lklayout_QtMultimedia -lklayout_QtPrintSupport -lklayout_QtSvg -lklayout_QtWidgets -lklayout_QtXmlPatterns LIBS += -lklayout_QtMultimedia -lklayout_QtPrintSupport -lklayout_QtSvg -lklayout_QtWidgets -lklayout_QtXmlPatterns
} }

7
src/pymod/QtUiTools/QtUiTools.pro
View File

@ -8,4 +8,9 @@ SOURCES = \
HEADERS += \ HEADERS += \
LIBS += -lklayout_QtUiTools -lklayout_QtCore contains(QT_MODULES, uitools) {
LIBS += -lklayout_QtUiTools
}
LIBS += -lklayout_QtCore

4
src/pymod/QtUiTools/QtUiToolsMain.cc
View File

@ -26,8 +26,10 @@
#include "../../gsiqt/qtbasic/gsiQtCoreExternals.h" #include "../../gsiqt/qtbasic/gsiQtCoreExternals.h"
FORCE_LINK_GSI_QTCORE FORCE_LINK_GSI_QTCORE
#include "../../gsiqt/qtbasic/gsiQtUiToolsExternals.h" #if defined(HAVE_QT_UITOOLS)
# include "../../gsiqt/qtbasic/gsiQtUiToolsExternals.h"
FORCE_LINK_GSI_QTUITOOLS FORCE_LINK_GSI_QTUITOOLS
#endif
DEFINE_PYMOD(QtUiTools, "QtUiTools", "KLayout/Qt module 'QtUiTools'") DEFINE_PYMOD(QtUiTools, "QtUiTools", "KLayout/Qt module 'QtUiTools'")

5
src/pymod/unit_tests/pymod_tests.cc
View File

@ -98,8 +98,13 @@ PYMODTEST (import_QtXml, "import_QtXml.py")
PYMODTEST (import_QtSql, "import_QtSql.py") PYMODTEST (import_QtSql, "import_QtSql.py")
PYMODTEST (import_QtNetwork, "import_QtNetwork.py") PYMODTEST (import_QtNetwork, "import_QtNetwork.py")
PYMODTEST (import_QtDesigner, "import_QtDesigner.py") PYMODTEST (import_QtDesigner, "import_QtDesigner.py")
#if defined(HAVE_QT_UITOOLS)
PYMODTEST (import_QtUiTools, "import_QtUiTools.py") PYMODTEST (import_QtUiTools, "import_QtUiTools.py")
#endif
#if QT_VERSION >= 0x50000 #if QT_VERSION >= 0x50000
PYMODTEST (import_QtWidgets, "import_QtWidgets.py") PYMODTEST (import_QtWidgets, "import_QtWidgets.py")