From 6d344047fa3368dd83efcbc46a6da1e1b9c3663d Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 26 Apr 2021 10:03:03 +0200 Subject: [PATCH 01/26] started qt6 migration --- cmake-library | 2 +- src/OpenMesh/Apps/CMakeLists.txt | 20 ++++++------- .../Decimating/DecimaterGui/CMakeLists.txt | 2 +- .../Apps/Decimating/decimaterviewer.cc | 7 ++++- src/OpenMesh/Apps/ProgViewer/CMakeLists.txt | 2 +- src/OpenMesh/Apps/ProgViewer/progviewer.cc | 9 ++++-- src/OpenMesh/Apps/QtViewer/CMakeLists.txt | 2 +- .../Apps/QtViewer/MeshViewerWidgetT_impl.hh | 2 +- src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc | 30 +++++++++++-------- src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh | 28 +++++++++++------ src/OpenMesh/Apps/QtViewer/meshviewer.cc | 10 ++++++- .../Subdivider/SubdividerGui/CMakeLists.txt | 2 +- src/OpenMesh/Apps/Subdivider/qtsubdivider.cc | 7 +++++ .../VDProgMesh/Synthesizer/CMakeLists.txt | 2 +- .../VDProgMesh/Synthesizer/vdpmsynthesizer.cc | 7 +++++ 15 files changed, 90 insertions(+), 42 deletions(-) diff --git a/cmake-library b/cmake-library index ab9edd27..fb435484 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit ab9edd278c64b3a387f4d8eb39eb2c2a091d6481 +Subproject commit fb4354848171b77a4f42966167bcd3071a878b3e diff --git a/src/OpenMesh/Apps/CMakeLists.txt b/src/OpenMesh/Apps/CMakeLists.txt index 2e17ab99..47468239 100644 --- a/src/OpenMesh/Apps/CMakeLists.txt +++ b/src/OpenMesh/Apps/CMakeLists.txt @@ -41,14 +41,14 @@ if ( BUILD_APPS ) find_package (OpenGL) # For the apps, we need qt and opengl to build them - if (NOT QT5_FOUND) - set(QT5_REQUIRED_PACKAGES - Qt5Core - Qt5Widgets - Qt5OpenGL - Qt5Gui + if (NOT QT_FOUND) + set(QT_REQUIRED_PACKAGES + Core + Widgets + OpenGL + Gui ) - vci_qt5 () + vci_qt () set(CMAKE_AUTOMOC ON) endif() @@ -57,7 +57,7 @@ if ( BUILD_APPS ) endif() # check for OpenGL as our required dependencies - if (( QT5_FOUND ) AND OPENGL_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) + if (( QT_FOUND ) AND OPENGL_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) add_subdirectory (Decimating/DecimaterGui) add_subdirectory (QtViewer) @@ -95,8 +95,8 @@ if ( BUILD_APPS ) else () # QT ,Opengl or glut not found - if (NOT QT5_FOUND) - message ("QT5 not found! Skipping some apps.") + if (NOT QT_FOUND) + message ("QT not found! Skipping some apps.") endif () if (NOT OPENGL_FOUND) diff --git a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt index 8baa357e..303a325a 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt @@ -29,7 +29,7 @@ endif () target_link_libraries (DecimaterGui OpenMeshCore OpenMeshTools - Qt5::OpenGL + ${QT_TARGET}::OpenGL ${OPENGL_LIBRARIES} ) diff --git a/src/OpenMesh/Apps/Decimating/decimaterviewer.cc b/src/OpenMesh/Apps/Decimating/decimaterviewer.cc index da5a22db..13cfed8c 100644 --- a/src/OpenMesh/Apps/Decimating/decimaterviewer.cc +++ b/src/OpenMesh/Apps/Decimating/decimaterviewer.cc @@ -50,6 +50,7 @@ #include #include #include +#include #include "DecimaterViewerWidget.hh" @@ -64,8 +65,12 @@ int main(int argc, char **argv) // OpenGL check QApplication app(argc,argv); - + +#if QT_VERSION_MAJOR < 6 if ( !QGLFormat::hasOpenGL() ) { +#else + if ( QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ) { +#endif QString msg = "System has no OpenGL support!"; QMessageBox::critical( nullptr, "OpenGL", msg + argv[1] ); return -1; diff --git a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt index c0adbdff..95b69568 100644 --- a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt @@ -28,7 +28,7 @@ endif () target_link_libraries ( ProgViewer OpenMeshCore OpenMeshTools - Qt5::OpenGL + ${QT_TARGET}::OpenGL ${OPENGL_LIBRARIES} ) diff --git a/src/OpenMesh/Apps/ProgViewer/progviewer.cc b/src/OpenMesh/Apps/ProgViewer/progviewer.cc index 4ce5de6b..d09e8c1f 100644 --- a/src/OpenMesh/Apps/ProgViewer/progviewer.cc +++ b/src/OpenMesh/Apps/ProgViewer/progviewer.cc @@ -51,15 +51,20 @@ #include #include #include -#include - +#if QT_VERSION_MAJOR > 5 +#include +#endif int main(int argc, char **argv) { // OpenGL check QApplication app(argc,argv); +#if QT_VERSION_MAJOR < 6 if ( !QGLFormat::hasOpenGL() ) { +#else + if ( QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ) { +#endif std::cerr << "This system has no OpenGL support.\n"; return -1; } diff --git a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt index aa704908..4c14e5a5 100644 --- a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt @@ -30,7 +30,7 @@ endif () target_link_libraries (QtViewer OpenMeshCore OpenMeshTools - Qt5::OpenGL + ${QT_TARGET}::OpenGL ${OPENGL_LIBRARIES} ) diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh index e796f7ce..339e3ac4 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh @@ -233,7 +233,7 @@ bool MeshViewerWidgetT::set_texture( QImage& _texsrc ) _texsrc = _texsrc.scaled( tex_w, tex_h, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ); } - QImage texture( QGLWidget::convertToGLFormat ( _texsrc ) ); + QImage texture = _texsrc.convertToFormat(QImage::Format_ARGB32).rgbSwapped(); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); diff --git a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc index ec2ce252..bf1f6973 100644 --- a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc +++ b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc @@ -60,6 +60,7 @@ #include #include #include +#include // -------------------- #include #include @@ -68,6 +69,10 @@ # define M_PI 3.1415926535897932 #endif +#if QT_VERSION_MAJOR > 5 +#define swapBuffers() +#endif + const double TRACKBALL_RADIUS = 0.6; @@ -81,21 +86,22 @@ std::string QGLViewerWidget::nomode_ = ""; //---------------------------------------------------------------------------- -QGLViewerWidget::QGLViewerWidget( QWidget* _parent ) - : QGLWidget( _parent ) +#if QT_VERSION_MAJOR < 6 +QGLViewerWidget::QGLViewerWidget( QWidget* _parent ) : QGLWidget( _parent ) +#else +QGLViewerWidget::QGLViewerWidget( QWidget* _parent ) : QOpenGLWidget( _parent ) +#endif { init(); } -//---------------------------------------------------------------------------- +//--------------------------------------------------------------------------- -QGLViewerWidget:: -QGLViewerWidget( QGLFormat& _fmt, QWidget* _parent ) - : QGLWidget( _fmt, _parent ) -{ - init(); +#if QT_VERSION_MAJOR > 5 +void QGLViewerWidget::updateGL() { + update(); } - +#endif //---------------------------------------------------------------------------- @@ -330,7 +336,7 @@ QGLViewerWidget::mouseMoveEvent( QMouseEvent* _event ) // move in z direction - if ( (_event->buttons() == (LeftButton+MidButton)) || + if ( (_event->buttons() == (LeftButton|MiddleButton)) || (_event->buttons() == LeftButton && _event->modifiers() == ControlModifier)) { float value_y = radius_ * dy * 3.0 / h; @@ -339,7 +345,7 @@ QGLViewerWidget::mouseMoveEvent( QMouseEvent* _event ) // move in x,y direction - else if ( (_event->buttons() == MidButton) || + else if ( (_event->buttons() == MiddleButton) || (_event->buttons() == LeftButton && _event->modifiers() == AltModifier) ) { float z = - (modelview_matrix_[ 2]*center_[0] + @@ -417,7 +423,7 @@ void QGLViewerWidget::wheelEvent(QWheelEvent* _event) { // Use the mouse wheel to zoom in/out - float d = -(float)_event->delta() / 120.0 * 0.2 * radius_; + float d = -(float)( _event->angleDelta().y() / 120.0 * 0.2 * radius_ ); translate(Vec3f(0.0, 0.0, d)); updateGL(); _event->accept(); diff --git a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh index 44bf295a..ddef0faa 100644 --- a/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh +++ b/src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh @@ -47,14 +47,15 @@ //== INCLUDES ================================================================= - - #include -#include #include #include #include - +#if QT_VERSION_MAJOR < 6 + #include +#else + #include +#endif //== FORWARD DECLARATIONS ===================================================== @@ -64,21 +65,25 @@ class QAction; //== CLASS DEFINITION ========================================================= - +#if QT_VERSION_MAJOR < 6 class QGLViewerWidget : public QGLWidget +#else +class QGLViewerWidget : public QOpenGLWidget +#endif { - Q_OBJECT + public: + #if QT_VERSION_MAJOR < 6 typedef QGLWidget Super; + #else + typedef QOpenGLWidget Super; + #endif // Default constructor. explicit QGLViewerWidget( QWidget* _parent=0 ); - // - QGLViewerWidget( QGLFormat& _fmt, QWidget* _parent=0 ); - // Destructor. virtual ~QGLViewerWidget(); @@ -88,6 +93,11 @@ private: public: +#if QT_VERSION_MAJOR > 5 + /* Updates the gui - used to provide backwards compability */ + void updateGL(); +#endif + /* Sets the center and size of the whole scene. The _center is used as fixpoint for rotations and for adjusting the camera/viewer (see view_all()). */ diff --git a/src/OpenMesh/Apps/QtViewer/meshviewer.cc b/src/OpenMesh/Apps/QtViewer/meshviewer.cc index fdb5c144..8593bc8a 100644 --- a/src/OpenMesh/Apps/QtViewer/meshviewer.cc +++ b/src/OpenMesh/Apps/QtViewer/meshviewer.cc @@ -44,12 +44,16 @@ #endif #include + #include #include #include #include #include #include +#if QT_VERSION_MAJOR > 5 +#include +#endif #include "MeshViewerWidget.hh" @@ -62,7 +66,11 @@ int main(int argc, char **argv) // OpenGL check QApplication app(argc,argv); - if ( !QGLFormat::hasOpenGL() ) { +#if QT_VERSION_MAJOR < 6 + if ( !QGLFormat::hasOpenGL() ) { +#else + if ( QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ) { +#endif QString msg = "System has no OpenGL support!"; QMessageBox::critical( nullptr, QString("OpenGL"), msg + QString(argv[1]) ); return -1; diff --git a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt index 81e87499..57145ea5 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt @@ -28,7 +28,7 @@ endif () target_link_libraries (SubdividerGui OpenMeshCore OpenMeshTools - Qt5::OpenGL + ${QT_TARGET}::OpenGL ${OPENGL_LIBRARIES} ) diff --git a/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc b/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc index 9421653b..b6674d63 100644 --- a/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc +++ b/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc @@ -51,13 +51,20 @@ #include #include #include "SubdivideWidget.hh" +#if QT_VERSION_MAJOR > 5 +#include +#endif int main(int argc, char **argv) { // OpenGL check QApplication app(argc,argv); +#if QT_VERSION_MAJOR < 6 if ( !QGLFormat::hasOpenGL() ) { +#else + if ( QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ) { +#endif QString msg = "System has no OpenGL support!"; QMessageBox::critical( nullptr, "OpenGL", msg + argv[1], QMessageBox::Ok ); return -1; diff --git a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt index c39d3459..68f731e5 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt +++ b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt @@ -25,6 +25,6 @@ endif () target_link_libraries (Synthesizer OpenMeshCore OpenMeshTools - Qt5::OpenGL + ${QT_TARGET}::OpenGL ${OPENGL_LIBRARIES} ) diff --git a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/vdpmsynthesizer.cc b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/vdpmsynthesizer.cc index a46e8a19..f122fa4a 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/vdpmsynthesizer.cc +++ b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/vdpmsynthesizer.cc @@ -49,6 +49,9 @@ #include #include +#if QT_VERSION_MAJOR > 5 +#include +#endif #include "VDPMSynthesizerViewerWidget.hh" @@ -58,7 +61,11 @@ int main(int argc, char **argv) QApplication app(argc,argv); +#if QT_VERSION_MAJOR < 6 if ( !QGLFormat::hasOpenGL() ) { +#else + if ( QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ) { +#endif std::cerr << "This system has no OpenGL support.\n"; return 1; } From 46c0ab1242f88e17a3d6cd0e02a3fd244502c0a7 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 26 Apr 2021 10:36:14 +0200 Subject: [PATCH 02/26] added fixupbundle --- cmake-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-library b/cmake-library index fb435484..bb48fc24 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit fb4354848171b77a4f42966167bcd3071a878b3e +Subproject commit bb48fc24f4910a39dc2182fc250c998810ca041c From 7cbe7f908597e744e0aedb32d1908996f5298391 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 26 Apr 2021 11:56:56 +0200 Subject: [PATCH 03/26] Fixed linker problems and added version specific qt packages --- cmake-library | 2 +- src/OpenMesh/Apps/CMakeLists.txt | 3 +++ src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt | 6 ++++++ src/OpenMesh/Apps/ProgViewer/CMakeLists.txt | 6 ++++++ src/OpenMesh/Apps/QtViewer/CMakeLists.txt | 6 ++++++ src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt | 5 +++++ src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt | 6 ++++++ 7 files changed, 33 insertions(+), 1 deletion(-) diff --git a/cmake-library b/cmake-library index bb48fc24..6f6d0149 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit bb48fc24f4910a39dc2182fc250c998810ca041c +Subproject commit 6f6d014958f62516be5a3d18d114733d661f63f8 diff --git a/src/OpenMesh/Apps/CMakeLists.txt b/src/OpenMesh/Apps/CMakeLists.txt index 47468239..ebf10ff9 100644 --- a/src/OpenMesh/Apps/CMakeLists.txt +++ b/src/OpenMesh/Apps/CMakeLists.txt @@ -48,6 +48,9 @@ if ( BUILD_APPS ) OpenGL Gui ) + set(QT6_REQUIRED_PACKAGES + OpenGLWidgets + ) vci_qt () set(CMAKE_AUTOMOC ON) endif() diff --git a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt index 303a325a..d6230e7e 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt @@ -30,6 +30,12 @@ target_link_libraries (DecimaterGui OpenMeshCore OpenMeshTools ${QT_TARGET}::OpenGL + ${QT_TARGET}::Widgets + ${QT_TARGET}::Gui ${OPENGL_LIBRARIES} ) +if (QT_VERSION_MAJOR GREATER 5) + target_link_libraries (DecimaterGui ${QT_TARGET}::OpenGLWidgets) +endif() + diff --git a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt index 95b69568..2a3e2daf 100644 --- a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt @@ -29,6 +29,12 @@ target_link_libraries ( ProgViewer OpenMeshCore OpenMeshTools ${QT_TARGET}::OpenGL + ${QT_TARGET}::Widgets + ${QT_TARGET}::Gui ${OPENGL_LIBRARIES} ) +if (QT_VERSION_MAJOR GREATER 5) + target_link_libraries (ProgViewer ${QT_TARGET}::OpenGLWidgets) +endif() + diff --git a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt index 4c14e5a5..38fb3e33 100644 --- a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt @@ -31,6 +31,12 @@ target_link_libraries (QtViewer OpenMeshCore OpenMeshTools ${QT_TARGET}::OpenGL + ${QT_TARGET}::Widgets + ${QT_TARGET}::Gui ${OPENGL_LIBRARIES} ) +if (QT_VERSION_MAJOR GREATER 5) + target_link_libraries (QtViewer ${QT_TARGET}::OpenGLWidgets) +endif() + diff --git a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt index 57145ea5..b981841b 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt @@ -29,6 +29,11 @@ target_link_libraries (SubdividerGui OpenMeshCore OpenMeshTools ${QT_TARGET}::OpenGL + ${QT_TARGET}::Widgets + ${QT_TARGET}::Gui ${OPENGL_LIBRARIES} ) +if (QT_VERSION_MAJOR GREATER 5) + target_link_libraries (SubdividerGui ${QT_TARGET}::OpenGLWidgets) +endif() diff --git a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt index 68f731e5..1cc83663 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt +++ b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt @@ -26,5 +26,11 @@ target_link_libraries (Synthesizer OpenMeshCore OpenMeshTools ${QT_TARGET}::OpenGL + ${QT_TARGET}::Widgets + ${QT_TARGET}::Gui ${OPENGL_LIBRARIES} ) + +if (QT_VERSION_MAJOR GREATER 5) + target_link_libraries (Synthesizer ${QT_TARGET}::OpenGLWidgets) +endif() From 8fc13b8a1a571c2ef1df117deb581de0b5751ac5 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 26 Apr 2021 12:03:11 +0200 Subject: [PATCH 04/26] Added cmake arguments to ci to force qt5 --- CI/Windows.bat | 8 ++++---- CI/ci-linux-prepare.sh | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CI/Windows.bat b/CI/Windows.bat index 903c74e8..4cca462a 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -25,12 +25,12 @@ IF "%BUILD_PLATFORM%" == "VS2015" ( IF "%ARCHITECTURE%" == "x64" ( set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64 - set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64 + set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64 -DQT_VERSION=5 ) IF "%ARCHITECTURE%" == "x32" ( set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015 - set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015 + set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015 -DQT_VERSION=5 ) ) @@ -43,7 +43,7 @@ IF "%BUILD_PLATFORM%" == "VS2017" ( IF "%ARCHITECTURE%" == "x64" ( set QT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64 - set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64 + set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64 -DQT_VERSION=5 ) ) @@ -57,7 +57,7 @@ IF "%BUILD_PLATFORM%" == "VS2019" ( IF "%ARCHITECTURE%" == "x64" ( set QT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 - set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 + set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 -DQT_VERSION=5 ) ) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index ff35c196..a73ff7d0 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -42,27 +42,27 @@ fi if [ "$QTVERSION" == "qt5.13.0" ]; then echo "Using QT5.13.0"; BUILDPATH="$BUILDPATH-qt5.13.0" - OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64 -DQT_VERSION=5" elif [ "$QTVERSION" == "qt5.12.2" ]; then echo "Using QT5.12.2"; BUILDPATH="$BUILDPATH-qt5.12.2" - OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64 -DQT_VERSION=5" elif [ "$QTVERSION" == "qt5.11.2" ]; then echo "Using QT5.11.2"; BUILDPATH="$BUILDPATH-qt5.11.2" - OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64 -DQT_VERSION=5" elif [ "$QTVERSION" == "qt5.9.0" ]; then echo "Using QT5.9.0"; BUILDPATH="$BUILDPATH-qt5.9.0" - OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.9/gcc_64 -DQT_VERSION=5" elif [ "$QTVERSION" == "qt5.13.2" ]; then echo "Using QT5.13.2"; BUILDPATH="$BUILDPATH-qt5.13.2" - OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64 -DQT_VERSION=5" elif [ "$QTVERSION" == "qt5.15.1" ]; then echo "Using QT5.15.1"; BUILDPATH="$BUILDPATH-qt5.15.1" - OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64 -DQT_VERSION=5" fi #===================================== From 72285d0ec73734ae1e1fdde15a6e424ac3746db0 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 26 Apr 2021 12:38:44 +0200 Subject: [PATCH 05/26] Added qt version 5.11.3 to the standard version list --- cmake-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-library b/cmake-library index 6f6d0149..f9049e0a 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit 6f6d014958f62516be5a3d18d114733d661f63f8 +Subproject commit f9049e0ac274ca59c857b28d8390ebc64073215d From 480c201e411c5f1ee1b7cd42ddeefbc20194385a Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 26 Apr 2021 12:41:10 +0200 Subject: [PATCH 06/26] Readded old qt version standard list --- cmake-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-library b/cmake-library index f9049e0a..a5e2f9db 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit f9049e0ac274ca59c857b28d8390ebc64073215d +Subproject commit a5e2f9db7f0308a29191a60b2a3f7af66fdcb340 From 42a6e445ccc9d303590a80b35fbf7b83664185c8 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 3 May 2021 13:33:29 +0200 Subject: [PATCH 07/26] fixbundle targets only when qt found --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc804660..0723c5d8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,12 +151,12 @@ endif() # Only call fixbundle, when we are building OpenMesh standalone if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") - if (WIN32 AND BUILD_APPS) + if (WIN32 AND BUILD_APPS AND QT_FOUND) # prepare bundle generation cmake file and add a build target for it configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/cmake/fixbundle.cmake.win.in" "${CMAKE_CURRENT_BINARY_DIR}/fixbundle.win.cmake" @ONLY IMMEDIATE) - if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) + if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") # let bundle generation depend on all targets add_dependencies (fixbundle QtViewer DecimaterGui) endif() @@ -164,7 +164,7 @@ if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") endif() # On apple we do a fixbundle, which is only necessary for the apps and not for the libs - if (APPLE AND BUILD_APPS) + if (APPLE AND BUILD_APPSA AND QT_FOUND) # prepare bundle generation cmake file and add a build target for it configure_file ("${CMAKE_SOURCE_DIR}/cmake/fixbundle.cmake.in" "${CMAKE_BINARY_DIR}/fixbundle.cmake" @ONLY IMMEDIATE) From 7118d481b7cfff4d8d4e53eefe177fba06a42276 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 3 May 2021 13:46:12 +0200 Subject: [PATCH 08/26] fixed typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0723c5d8..f67977d7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,7 @@ if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") endif() # On apple we do a fixbundle, which is only necessary for the apps and not for the libs - if (APPLE AND BUILD_APPSA AND QT_FOUND) + if (APPLE AND BUILD_APPS AND QT_FOUND) # prepare bundle generation cmake file and add a build target for it configure_file ("${CMAKE_SOURCE_DIR}/cmake/fixbundle.cmake.in" "${CMAKE_BINARY_DIR}/fixbundle.cmake" @ONLY IMMEDIATE) From 3323f55f65dd4205ed6c7e4b572e90fd0490111b Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 3 May 2021 13:52:47 +0200 Subject: [PATCH 09/26] fixbundle only when qt was found --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f67977d7..adf761e5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ if ( NOT DEFINED BUILD_APPS ) endif() # Only call fixbundle, when we are building OpenMesh standalone -if( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS ) +if( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS AND QT_FOUND ) if (WIN32) if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" AND BUILD_APPS ) From 362672c63c01c20fe6070a93319747dd4ac84e6f Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 3 May 2021 13:55:10 +0200 Subject: [PATCH 10/26] revert changes to cmakelist --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index adf761e5..fc804660 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ if ( NOT DEFINED BUILD_APPS ) endif() # Only call fixbundle, when we are building OpenMesh standalone -if( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS AND QT_FOUND ) +if( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS ) if (WIN32) if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" AND BUILD_APPS ) @@ -151,12 +151,12 @@ endif() # Only call fixbundle, when we are building OpenMesh standalone if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") - if (WIN32 AND BUILD_APPS AND QT_FOUND) + if (WIN32 AND BUILD_APPS) # prepare bundle generation cmake file and add a build target for it configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/cmake/fixbundle.cmake.win.in" "${CMAKE_CURRENT_BINARY_DIR}/fixbundle.win.cmake" @ONLY IMMEDIATE) - if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") + if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) # let bundle generation depend on all targets add_dependencies (fixbundle QtViewer DecimaterGui) endif() @@ -164,7 +164,7 @@ if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") endif() # On apple we do a fixbundle, which is only necessary for the apps and not for the libs - if (APPLE AND BUILD_APPS AND QT_FOUND) + if (APPLE AND BUILD_APPS) # prepare bundle generation cmake file and add a build target for it configure_file ("${CMAKE_SOURCE_DIR}/cmake/fixbundle.cmake.in" "${CMAKE_BINARY_DIR}/fixbundle.cmake" @ONLY IMMEDIATE) From 0dbf83eef706a3adfde2fcf4815fe500b36df5ef Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 3 May 2021 14:03:27 +0200 Subject: [PATCH 11/26] fixbundle depencies only if qt found --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc804660..9ab137ec 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,7 +170,9 @@ if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") "${CMAKE_BINARY_DIR}/fixbundle.cmake" @ONLY IMMEDIATE) # let bundle generation depend on all targets - add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui) + if (QT_FOUND) + add_dependencies (fixbundle DecimaterGui ProgViewer QtViewer SubdividerGui) + endif() # Required for Snow leopard, and the latest qt. Then the resources have to be copied if ( EXISTS "/opt/local/libexec/qt4-mac/lib/QtGui.framework/Versions/4/Resources/qt_menu.nib" ) From c8c5f6fb353c8c0e9e52402ec62d219e1e499a23 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 3 May 2021 14:30:08 +0200 Subject: [PATCH 12/26] added qt6 ci jobs --- .gitlab-ci.yml | 225 +++++++++++++++++++++++++++++++++++++++++ CI/ci-linux-prepare.sh | 4 + CI/gitlab-ci/linux.yml | 3 + 3 files changed, 232 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40a690ff..717550ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,231 @@ cppcheck: paths: - cppcheck.log +#----------- Job Informations: +# Type: Build: debug +# OS: Linux +# Compiler: gcc +# Language: cpp11 +# QT Version: qt6.0.0 + +build-debug-gcc-cpp11-qt6.0.0: + stage: build + script: "CI/ci-linux-build.sh" + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + variables: + COMPILER: "gcc" + LANGUAGE: "cpp11" + BUILD_TYPE: "debug" + QTVERSION: "qt6.0.0" + IWYU: "no" + VECTORCHECKS: "yes" + artifacts: + paths: + - build-gcc-cpp11-qt6.0.0-debug-vectorchecks/ + +#----------- Job Informations: +# Type: Test: debug +# OS: Linux +# Compiler: gcc +# Language: cpp11 + +test-debug-gcc-cpp11-qt6.0.0: + stage: test + script: "CI/ci-linux-test.sh" + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "gcc" + LANGUAGE: "cpp11" + BUILD_TYPE: "debug" + QTVERSION: "qt6.0.0" + IWYU: "no" + VECTORCHECKS: "yes" + dependencies: [build-debug-gcc-cpp11-qt6.0.0] + needs: [build-debug-gcc-cpp11-qt6.0.0] + artifacts: + reports: + junit: + - build-gcc-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report.xml + - build-gcc-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report-customvec.xml + - build-gcc-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report-doublevec.xml + + +#----------- Job Informations: +# Type: Build: release +# OS: Linux +# Compiler: gcc +# Language: cpp11 +# QT Version: qt6.0.0 + +build-release-gcc-cpp11-qt6.0.0: + stage: build + script: "CI/ci-linux-build.sh" + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + variables: + COMPILER: "gcc" + LANGUAGE: "cpp11" + BUILD_TYPE: "release" + QTVERSION: "qt6.0.0" + IWYU: "no" + VECTORCHECKS: "yes" + artifacts: + paths: + - build-gcc-cpp11-qt6.0.0-release-vectorchecks/ + +#----------- Job Informations: +# Type: Test: release +# OS: Linux +# Compiler: gcc +# Language: cpp11 + +test-release-gcc-cpp11-qt6.0.0: + stage: test + script: "CI/ci-linux-test.sh" + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "gcc" + LANGUAGE: "cpp11" + BUILD_TYPE: "release" + QTVERSION: "qt6.0.0" + IWYU: "no" + VECTORCHECKS: "yes" + dependencies: [build-release-gcc-cpp11-qt6.0.0] + needs: [build-release-gcc-cpp11-qt6.0.0] + artifacts: + reports: + junit: + - build-gcc-cpp11-qt6.0.0-release-vectorchecks/Unittests/report.xml + - build-gcc-cpp11-qt6.0.0-release-vectorchecks/Unittests/report-customvec.xml + - build-gcc-cpp11-qt6.0.0-release-vectorchecks/Unittests/report-doublevec.xml + + +#----------- Job Informations: +# Type: Build: debug +# OS: Linux +# Compiler: clang +# Language: cpp11 +# QT Version: qt6.0.0 + +build-debug-clang-cpp11-qt6.0.0: + stage: build + script: "CI/ci-linux-build.sh" + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + variables: + COMPILER: "clang" + LANGUAGE: "cpp11" + BUILD_TYPE: "debug" + QTVERSION: "qt6.0.0" + IWYU: "no" + VECTORCHECKS: "yes" + artifacts: + paths: + - build-clang-cpp11-qt6.0.0-debug-vectorchecks/ + +#----------- Job Informations: +# Type: Test: debug +# OS: Linux +# Compiler: clang +# Language: cpp11 + +test-debug-clang-cpp11-qt6.0.0: + stage: test + script: "CI/ci-linux-test.sh" + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "clang" + LANGUAGE: "cpp11" + BUILD_TYPE: "debug" + QTVERSION: "qt6.0.0" + IWYU: "no" + VECTORCHECKS: "yes" + dependencies: [build-debug-clang-cpp11-qt6.0.0] + needs: [build-debug-clang-cpp11-qt6.0.0] + artifacts: + reports: + junit: + - build-clang-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report.xml + - build-clang-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report-customvec.xml + - build-clang-cpp11-qt6.0.0-debug-vectorchecks/Unittests/report-doublevec.xml + + +#----------- Job Informations: +# Type: Build: release +# OS: Linux +# Compiler: clang +# Language: cpp11 +# QT Version: qt6.0.0 + +build-release-clang-cpp11-qt6.0.0: + stage: build + script: "CI/ci-linux-build.sh" + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + variables: + COMPILER: "clang" + LANGUAGE: "cpp11" + BUILD_TYPE: "release" + QTVERSION: "qt6.0.0" + IWYU: "no" + VECTORCHECKS: "yes" + artifacts: + paths: + - build-clang-cpp11-qt6.0.0-release-vectorchecks/ + +#----------- Job Informations: +# Type: Test: release +# OS: Linux +# Compiler: clang +# Language: cpp11 + +test-release-clang-cpp11-qt6.0.0: + stage: test + script: "CI/ci-linux-test.sh" + #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + tags: + - Linux + - stretch + - MultiThreads + variables: + COMPILER: "clang" + LANGUAGE: "cpp11" + BUILD_TYPE: "release" + QTVERSION: "qt6.0.0" + IWYU: "no" + VECTORCHECKS: "yes" + dependencies: [build-release-clang-cpp11-qt6.0.0] + needs: [build-release-clang-cpp11-qt6.0.0] + artifacts: + reports: + junit: + - build-clang-cpp11-qt6.0.0-release-vectorchecks/Unittests/report.xml + - build-clang-cpp11-qt6.0.0-release-vectorchecks/Unittests/report-customvec.xml + - build-clang-cpp11-qt6.0.0-release-vectorchecks/Unittests/report-doublevec.xml + + + #----------- Job Informations: # Type: Build: debug # OS: Linux diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index 0ce3ff3b..fda38637 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -63,6 +63,10 @@ elif [ "$QTVERSION" == "qt5.15.1" ]; then echo "Using QT5.15.1"; BUILDPATH="$BUILDPATH-qt5.15.1" OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64 -DQT_VERSION=5" +elif [ "$QTVERSION" == "qt5.15.1" ]; then + echo "Using QT6.0.0"; + BUILDPATH="$BUILDPATH-qt6.0.0" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.0.0/6.0.0/gcc_64 -DQT_VERSION=6" fi #===================================== diff --git a/CI/gitlab-ci/linux.yml b/CI/gitlab-ci/linux.yml index 6d1653ad..2f48cc23 100644 --- a/CI/gitlab-ci/linux.yml +++ b/CI/gitlab-ci/linux.yml @@ -12,6 +12,9 @@ cppcheck: paths: - cppcheck.log +{linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp11, QT_VERSION=qt6.0.0} +{linux-template-job.yml, COMPILER=clang, LANGUAGE=cpp11, QT_VERSION=qt6.0.0} + {linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp11, QT_VERSION=qt5.15.1} {linux-template-job.yml, COMPILER=clang, LANGUAGE=cpp11, QT_VERSION=qt5.15.1} {linux-template-job.yml, COMPILER=gcc, LANGUAGE=cpp14, QT_VERSION=qt5.15.1} From 72a5f4f0723086e36f7a06855f1cb222bd90af38 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 3 May 2021 15:12:53 +0200 Subject: [PATCH 13/26] fixed qt 6 lookup path --- CI/ci-linux-prepare.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index fda38637..5b84e281 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -63,10 +63,14 @@ elif [ "$QTVERSION" == "qt5.15.1" ]; then echo "Using QT5.15.1"; BUILDPATH="$BUILDPATH-qt5.15.1" OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64 -DQT_VERSION=5" -elif [ "$QTVERSION" == "qt5.15.1" ]; then +elif [ "$QTVERSION" == "qt6.0.0" ]; then echo "Using QT6.0.0"; BUILDPATH="$BUILDPATH-qt6.0.0" OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.0.0/6.0.0/gcc_64 -DQT_VERSION=6" +elif [ "$QTVERSION" == "qt6.0.3" ]; then + echo "Using QT6.0.3"; + BUILDPATH="$BUILDPATH-qt6.0.3" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.0.3/gcc_64 -DQT_VERSION=6" fi #===================================== From dd5dfe586f0014b1557ea42770b590da8fa3b899 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 11 May 2021 10:03:51 +0200 Subject: [PATCH 14/26] Changed gtest path --- CI/ci-linux-prepare.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index 5b84e281..a8c34f35 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -8,7 +8,8 @@ MAKE_OPTIONS="" BUILDPATH="" # set GTEST path -OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0" +# OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0" +OPTIONS="-DGTEST_ROOT=/usr/src/gtest/" if [ "$COMPILER" == "gcc" ]; then echo "Building with GCC"; @@ -66,7 +67,7 @@ elif [ "$QTVERSION" == "qt5.15.1" ]; then elif [ "$QTVERSION" == "qt6.0.0" ]; then echo "Using QT6.0.0"; BUILDPATH="$BUILDPATH-qt6.0.0" - OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.0.0/6.0.0/gcc_64 -DQT_VERSION=6" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.0.0/gcc_64 -DQT_VERSION=6" elif [ "$QTVERSION" == "qt6.0.3" ]; then echo "Using QT6.0.3"; BUILDPATH="$BUILDPATH-qt6.0.3" From 48cedae16f44b2121247170d70265ad41522ab3e Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 11 May 2021 10:08:30 +0200 Subject: [PATCH 15/26] Changed gtest path --- CI/ci-linux-prepare.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index a8c34f35..b00b52ef 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -8,8 +8,11 @@ MAKE_OPTIONS="" BUILDPATH="" # set GTEST path -# OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0" -OPTIONS="-DGTEST_ROOT=/usr/src/gtest/" +if [ -d "$HOME/sw/gtest-1.10.0" ]; then + OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0" +else + OPTIONS="-DGTEST_ROOT=/usr/src/gtest/" +fi if [ "$COMPILER" == "gcc" ]; then echo "Building with GCC"; From 081283aee297df1a61a51be64f8a72e2b9ca302e Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 11 May 2021 10:12:57 +0200 Subject: [PATCH 16/26] Changed gtest path --- CI/ci-linux-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index b00b52ef..04bd972a 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -9,7 +9,7 @@ BUILDPATH="" # set GTEST path if [ -d "$HOME/sw/gtest-1.10.0" ]; then - OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0" + OPTIONS="-DGTEST_ROOT=$HOME/sw/gtest-1.10.0" else OPTIONS="-DGTEST_ROOT=/usr/src/gtest/" fi From f663e73ab1274b775ba043bff7cdcd0845ebcfb1 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 11 May 2021 11:07:16 +0200 Subject: [PATCH 17/26] add gtest to library path --- CI/ci-linux-prepare.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index 04bd972a..dd3c4d98 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -10,6 +10,7 @@ BUILDPATH="" # set GTEST path if [ -d "$HOME/sw/gtest-1.10.0" ]; then OPTIONS="-DGTEST_ROOT=$HOME/sw/gtest-1.10.0" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/sw/gtest-1.10.0" else OPTIONS="-DGTEST_ROOT=/usr/src/gtest/" fi From e919339ee8b22736e32c434bd2e32c7fc091d66e Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 11 May 2021 11:10:22 +0200 Subject: [PATCH 18/26] add gtest to library path --- CI/ci-linux-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index dd3c4d98..085bfbca 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -10,7 +10,7 @@ BUILDPATH="" # set GTEST path if [ -d "$HOME/sw/gtest-1.10.0" ]; then OPTIONS="-DGTEST_ROOT=$HOME/sw/gtest-1.10.0" - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/sw/gtest-1.10.0" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/sw/gtest-1.10.0/lib" else OPTIONS="-DGTEST_ROOT=/usr/src/gtest/" fi From 822310ede3508bcf2e2e9b02aebd4b6c8e8069af Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 18 May 2021 13:53:15 +0200 Subject: [PATCH 19/26] fixed error in cmake-library --- cmake-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-library b/cmake-library index a5e2f9db..c7c9fada 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit a5e2f9db7f0308a29191a60b2a3f7af66fdcb340 +Subproject commit c7c9fada9efec854277e8c30bc95106024da3aab From 07864a7eeaf67a06269dfa8818a9aa8a5a419fd2 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 8 Jun 2021 15:11:32 +0200 Subject: [PATCH 20/26] openflipper qt6 --- cmake-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-library b/cmake-library index c7c9fada..18ddafb8 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit c7c9fada9efec854277e8c30bc95106024da3aab +Subproject commit 18ddafb8641f98f36912bc04c15df9dcded6bef2 From b8632e205d619aaac98fa78fdd4cf802bbde3d80 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 12 Jul 2021 16:39:52 +0200 Subject: [PATCH 21/26] Only search qt in default path if no manual path is set --- cmake-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-library b/cmake-library index 18ddafb8..65bff0eb 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit 18ddafb8641f98f36912bc04c15df9dcded6bef2 +Subproject commit 65bff0eb3b192554ee1538faff77908de2010cab From 48613702351b866d1a52581b95e96279df60498a Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Mon, 19 Jul 2021 11:58:45 +0200 Subject: [PATCH 22/26] added qt6 default versions to version list --- cmake-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-library b/cmake-library index 65bff0eb..f235866f 160000 --- a/cmake-library +++ b/cmake-library @@ -1 +1 @@ -Subproject commit 65bff0eb3b192554ee1538faff77908de2010cab +Subproject commit f235866ffe218fc6e440de27622d6c8a1e1210a5 From 3e7385dd272214fb228147c52933b23d7e68663e Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 27 Jul 2021 10:59:39 +0200 Subject: [PATCH 23/26] VS2019 now compiles with qt6 --- .gitlab-ci.yml | 4 ++-- CI/Windows.bat | 4 ++-- CI/gitlab-ci/windows.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 717550ad..b41c61e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -863,7 +863,7 @@ build-VS2019-x64-shared-TRUE-apps: script: "CI\\Windows.bat" tags: - VS2019 - - Qt5150 + - Qt612 artifacts: paths: - build-release/*.exe @@ -891,7 +891,7 @@ build-VS2019-x64-shared-FALSE-apps: script: "CI\\Windows.bat" tags: - VS2019 - - Qt5150 + - Qt612 artifacts: paths: - build-release/*.exe diff --git a/CI/Windows.bat b/CI/Windows.bat index 4cca462a..41d596b5 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -56,8 +56,8 @@ IF "%BUILD_PLATFORM%" == "VS2019" ( set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.com" IF "%ARCHITECTURE%" == "x64" ( - set QT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 - set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 -DQT_VERSION=5 + set QT_INSTALL_PATH=E:\Qt\6.1.2\msvc2019_64 + set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\6.1.2\msvc2019_64 -DQT_VERSION=6 ) ) diff --git a/CI/gitlab-ci/windows.yml b/CI/gitlab-ci/windows.yml index 01a994dc..85bffd7c 100644 --- a/CI/gitlab-ci/windows.yml +++ b/CI/gitlab-ci/windows.yml @@ -2,8 +2,8 @@ # Windows tasks # ----------------- -{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150} -{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150} +{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt612} +{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt612} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101} From 4ae331a33e4d3d3b778a722a99f36903d79b6eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 7 Sep 2021 09:18:44 +0200 Subject: [PATCH 24/26] FIxed docker image path --- CI/gitlab-ci/linux-iwyu-job.yml | 2 +- CI/gitlab-ci/linux-novchecks-job.yml | 2 +- CI/gitlab-ci/linux-template-build-job.yml | 2 +- CI/gitlab-ci/linux-template-test-job.yml | 2 +- CI/gitlab-ci/linux.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CI/gitlab-ci/linux-iwyu-job.yml b/CI/gitlab-ci/linux-iwyu-job.yml index cb8b0d58..af88f26c 100644 --- a/CI/gitlab-ci/linux-iwyu-job.yml +++ b/CI/gitlab-ci/linux-iwyu-job.yml @@ -7,7 +7,7 @@ iwyu-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: stage: build script: "CI/ci-linux-build.sh" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch diff --git a/CI/gitlab-ci/linux-novchecks-job.yml b/CI/gitlab-ci/linux-novchecks-job.yml index 63ae0ead..a3d80118 100644 --- a/CI/gitlab-ci/linux-novchecks-job.yml +++ b/CI/gitlab-ci/linux-novchecks-job.yml @@ -7,7 +7,7 @@ nvc-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: stage: build script: "CI/ci-linux-build.sh" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch diff --git a/CI/gitlab-ci/linux-template-build-job.yml b/CI/gitlab-ci/linux-template-build-job.yml index bd1d5b42..16785396 100644 --- a/CI/gitlab-ci/linux-template-build-job.yml +++ b/CI/gitlab-ci/linux-template-build-job.yml @@ -8,7 +8,7 @@ build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index 5b84581a..57bb3293 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -7,7 +7,7 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch diff --git a/CI/gitlab-ci/linux.yml b/CI/gitlab-ci/linux.yml index 2f48cc23..783706ff 100644 --- a/CI/gitlab-ci/linux.yml +++ b/CI/gitlab-ci/linux.yml @@ -5,7 +5,7 @@ cppcheck: stage: build script: "CI/ci-cppcheck.sh" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] timeout: 3h artifacts: From 864c4d1f49ead036394deda1e4f3fd54f45ad377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 7 Sep 2021 09:25:05 +0200 Subject: [PATCH 25/26] FIxed fix --- .gitlab-ci.yml | 54 ++++++++++++------------ CI/gitlab-ci/linux-template-test-job.yml | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b41c61e8..2c4dc596 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ variables: cppcheck: stage: build script: "CI/ci-cppcheck.sh" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: [Docker] timeout: 3h artifacts: @@ -42,7 +42,7 @@ cppcheck: build-debug-gcc-cpp11-qt6.0.0: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -66,7 +66,7 @@ build-debug-gcc-cpp11-qt6.0.0: test-debug-gcc-cpp11-qt6.0.0: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -98,7 +98,7 @@ test-debug-gcc-cpp11-qt6.0.0: build-release-gcc-cpp11-qt6.0.0: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -122,7 +122,7 @@ build-release-gcc-cpp11-qt6.0.0: test-release-gcc-cpp11-qt6.0.0: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -154,7 +154,7 @@ test-release-gcc-cpp11-qt6.0.0: build-debug-clang-cpp11-qt6.0.0: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -178,7 +178,7 @@ build-debug-clang-cpp11-qt6.0.0: test-debug-clang-cpp11-qt6.0.0: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -210,7 +210,7 @@ test-debug-clang-cpp11-qt6.0.0: build-release-clang-cpp11-qt6.0.0: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -234,7 +234,7 @@ build-release-clang-cpp11-qt6.0.0: test-release-clang-cpp11-qt6.0.0: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -267,7 +267,7 @@ test-release-clang-cpp11-qt6.0.0: build-debug-gcc-cpp11-qt5.15.1: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -291,7 +291,7 @@ build-debug-gcc-cpp11-qt5.15.1: test-debug-gcc-cpp11-qt5.15.1: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -323,7 +323,7 @@ test-debug-gcc-cpp11-qt5.15.1: build-release-gcc-cpp11-qt5.15.1: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -347,7 +347,7 @@ build-release-gcc-cpp11-qt5.15.1: test-release-gcc-cpp11-qt5.15.1: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -379,7 +379,7 @@ test-release-gcc-cpp11-qt5.15.1: build-debug-clang-cpp11-qt5.15.1: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -403,7 +403,7 @@ build-debug-clang-cpp11-qt5.15.1: test-debug-clang-cpp11-qt5.15.1: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -435,7 +435,7 @@ test-debug-clang-cpp11-qt5.15.1: build-release-clang-cpp11-qt5.15.1: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -459,7 +459,7 @@ build-release-clang-cpp11-qt5.15.1: test-release-clang-cpp11-qt5.15.1: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -491,7 +491,7 @@ test-release-clang-cpp11-qt5.15.1: build-debug-gcc-cpp14-qt5.15.1: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -515,7 +515,7 @@ build-debug-gcc-cpp14-qt5.15.1: test-debug-gcc-cpp14-qt5.15.1: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -547,7 +547,7 @@ test-debug-gcc-cpp14-qt5.15.1: build-release-gcc-cpp14-qt5.15.1: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -571,7 +571,7 @@ build-release-gcc-cpp14-qt5.15.1: test-release-gcc-cpp14-qt5.15.1: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -603,7 +603,7 @@ test-release-gcc-cpp14-qt5.15.1: build-debug-clang-cpp14-qt5.15.1: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -627,7 +627,7 @@ build-debug-clang-cpp14-qt5.15.1: test-debug-clang-cpp14-qt5.15.1: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -659,7 +659,7 @@ test-debug-clang-cpp14-qt5.15.1: build-release-clang-cpp14-qt5.15.1: stage: build script: "CI/ci-linux-build.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -683,7 +683,7 @@ build-release-clang-cpp14-qt5.15.1: test-release-clang-cpp14-qt5.15.1: stage: test script: "CI/ci-linux-test.sh" - #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -715,7 +715,7 @@ test-release-clang-cpp14-qt5.15.1: iwyu-release-clang-cpp14-qt5.15.1: stage: build script: "CI/ci-linux-build.sh" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch @@ -739,7 +739,7 @@ iwyu-release-clang-cpp14-qt5.15.1: nvc-release-clang-cpp14-qt5.15.1: stage: build script: "CI/ci-linux-build.sh" - image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml index 57bb3293..a31754c2 100644 --- a/CI/gitlab-ci/linux-template-test-job.yml +++ b/CI/gitlab-ci/linux-template-test-job.yml @@ -7,7 +7,7 @@ test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}: stage: test script: "CI/ci-linux-test.sh" - #image: gitlab.vci.graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container + #image: gitlab.vci.rwth-aachen.de:4567/docker/docker/docker-openmesh-container tags: - Linux - stretch From 6e6ea334ccbeaab771cb108c9f098cc926446d7b Mon Sep 17 00:00:00 2001 From: mx Date: Tue, 7 Sep 2021 11:21:36 +0200 Subject: [PATCH 26/26] Fixed value string followed by spaces error --- CI/gitlab-ci/assemble-gitlab-ci.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CI/gitlab-ci/assemble-gitlab-ci.py b/CI/gitlab-ci/assemble-gitlab-ci.py index 02b2eade..bcace39c 100755 --- a/CI/gitlab-ci/assemble-gitlab-ci.py +++ b/CI/gitlab-ci/assemble-gitlab-ci.py @@ -2,7 +2,7 @@ import sys, os, re, yaml, hashlib -# Version 3.2 +# Version 3.3 # Script for automated gitlab-ci creation # Assembles the gitlab ci from master template file: @@ -76,7 +76,7 @@ def fetchVariableReplacers(variablesGrep): if (key != None and value != None): key = key.strip() - result[key] = value + result[key] = value.strip() return result @@ -174,3 +174,4 @@ def main(): # Execute main function if __name__ == '__main__': main() +