From 6f487c2c2491b26506a853a41c89947a1d5398ab Mon Sep 17 00:00:00 2001 From: Alan Morris Date: Wed, 18 Aug 2021 16:15:55 -0600 Subject: [PATCH 01/12] Enable high-dpi support for plots. --- lib/jkqtplotter/jkqtplotter.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/jkqtplotter/jkqtplotter.cpp b/lib/jkqtplotter/jkqtplotter.cpp index 312aff58ca..cc4e8aba24 100644 --- a/lib/jkqtplotter/jkqtplotter.cpp +++ b/lib/jkqtplotter/jkqtplotter.cpp @@ -1236,8 +1236,9 @@ void JKQTPlotter::resizeEvent(QResizeEvent *event) { void JKQTPlotter::delayedResizeEvent() { - int plotImageWidth=width(); - int plotImageHeight=height(); + qreal dpr = devicePixelRatioF(); + int plotImageWidth=width() * dpr; + int plotImageHeight=height() * dpr; plotImageHeight=plotImageHeight-getPlotYOffset(); //qDebug()<<"resize: "< Date: Fri, 15 Apr 2022 22:12:24 +0200 Subject: [PATCH 02/12] added build for higher Qt version to appveyor.yml --- appveyor.yml | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2c17a8d57d..ed6c924d0a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,51 +1,54 @@ version: 0.{build}-{branch} -image: - - Visual Studio 2017 environment: global: - QTVER: 5.11 JOMDIR: C:\Qt\Tools\QtCreator\bin MINGWDIR: C:\Qt\Tools\mingw530_32 VSVER: 0 + USE_LINUX: false matrix: - - QTABI: mingw53_32 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QTABI: mingw53_32 + QTVER: 5.11 ARCH: x86 MAKETOOL: mingw32-make CMAKE_GENERATOR: "MinGW Makefiles" USE_CMAKE: true MSBUILD_FLAGS: -# - QTABI: mingw53_32 -# ARCH: x86 -# QMAKESPEC: win32-g++ -# MAKETOOL: mingw32-make -# USE_CMAKE: false - - QTABI: msvc2017_64 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QTABI: msvc2017_64 + QTVER: 5.11 ARCH: x64 VSVER: 2017 CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" USE_CMAKE: true MSBUILD_FLAGS: /verbosity:minimal /maxcpucount -# - QTABI: msvc2017_64 -# ARCH: x64 -# VSVER: 2017 -# QMAKESPEC: win32-msvc -# MAKETOOL: jom -# USE_CMAKE: false - - QTABI: msvc2015 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + QTABI: msvc2019_64 + QTVER: 5.15.2 + ARCH: x64 + VSVER: 2019 + CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + USE_CMAKE: true + MSBUILD_FLAGS: /verbosity:minimal /maxcpucount + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QTABI: msvc2015 + QTVER: 5.11 ARCH: x86 VSVER: 14 CMAKE_GENERATOR: "Visual Studio 15 2017" USE_CMAKE: true MSBUILD_FLAGS: /verbosity:minimal /maxcpucount -# - QTABI: msvc2015 -# ARCH: x86 -# VSVER: 14 -# QMAKESPEC: win32-msvc -# MAKETOOL: jom -# USE_CMAKE: false + # - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + # QTABI: gcc_64 + # QTVER: 5.15.2 + # ARCH: x64 + # CMAKE_GENERATOR: "Unix Makefiles" + # USE_CMAKE: true + # USE_LINUX: true + skip_tags: true From 098bcf9c8b7b70ed5329713fad28bfcad4c7cec6 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Fri, 15 Apr 2022 23:01:09 +0200 Subject: [PATCH 03/12] activated high-dpi scaling for all JKQtPlotter examples --- examples/advplotstyling/advplotstyling.cpp | 6 ++++++ examples/barchart/barchart.cpp | 6 ++++++ examples/boxplot/boxplot.cpp | 6 ++++++ examples/contourplot/contourplot.cpp | 6 ++++++ examples/datastore/datastore.cpp | 6 ++++++ .../datastore_groupedstat/datastore_groupedstat.cpp | 6 ++++++ .../datastore_iterators/datastore_iterators.cpp | 6 ++++++ .../datastore_regression/datastore_regression.cpp | 6 ++++++ .../datastore_statistics/datastore_statistics.cpp | 6 ++++++ .../datastore_statistics_2d.cpp | 6 ++++++ examples/dateaxes/dateaxes.cpp | 6 ++++++ examples/distributionplot/test_distributionplot.cpp | 6 ++++++ examples/errorbarstyles/errorbarstyles.cpp | 6 ++++++ examples/evalcurve/evalcurve.cpp | 6 ++++++ examples/filledgraphs/filledgraphs.cpp | 6 ++++++ examples/functionplot/functionplot.cpp | 6 ++++++ examples/geo_arrows/geo_arrows.cpp | 6 ++++++ examples/geo_simple/geo_simple.cpp | 6 ++++++ examples/geometric/geometric.cpp | 6 ++++++ examples/imageplot/imageplot.cpp | 6 ++++++ examples/imageplot_modifier/imageplot_modifier.cpp | 6 ++++++ .../imageplot_nodatastore/imageplot_nodatastore.cpp | 6 ++++++ examples/imageplot_userpal/imageplot_userpal.cpp | 6 ++++++ examples/impulsesplot/impulsesplot.cpp | 6 ++++++ .../jkqtmathtext_simpletest.cpp | 6 ++++++ examples/jkqtmathtext_test/jkqtmathtext_test.cpp | 6 ++++++ examples/jkqtplot_test/jkqtplot_test.cpp | 6 ++++++ examples/logaxes/logaxes.cpp | 6 ++++++ examples/mandelbrot/mandelbrot.cpp | 6 ++++++ examples/multiplot/test_multiplot.cpp | 6 ++++++ examples/parametriccurve/parametriccurve.cpp | 6 ++++++ examples/paramscatterplot/paramscatterplot.cpp | 6 ++++++ .../paramscatterplot_image.cpp | 6 ++++++ examples/parsedfunctionplot/parsedfunctionplot.cpp | 6 ++++++ examples/rgbimageplot/rgbimageplot.cpp | 6 ++++++ examples/rgbimageplot_qt/rgbimageplot_qt.cpp | 6 ++++++ examples/simpletest/simpletest.cpp | 13 +++++++++++++ examples/speed/speed.cpp | 6 ++++++ examples/stackedbars/stackedbars.cpp | 6 ++++++ examples/stepplots/stepplots.cpp | 6 ++++++ examples/styledboxplot/test_styledboxplot.cpp | 6 ++++++ examples/styling/test_styling_main.cpp | 6 ++++++ examples/symbols_and_errors/symbols_and_errors.cpp | 6 ++++++ examples/symbols_and_styles/symbols_and_styles.cpp | 6 ++++++ examples/ui/ui.cpp | 6 ++++++ .../user_interaction/test_user_interaction_main.cpp | 6 ++++++ examples/violinplot/violinplot.cpp | 6 ++++++ 47 files changed, 289 insertions(+) diff --git a/examples/advplotstyling/advplotstyling.cpp b/examples/advplotstyling/advplotstyling.cpp index d64542da54..410fa5b5a0 100644 --- a/examples/advplotstyling/advplotstyling.cpp +++ b/examples/advplotstyling/advplotstyling.cpp @@ -13,8 +13,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/barchart/barchart.cpp b/examples/barchart/barchart.cpp index 4ab917a1ff..79d9698ce6 100644 --- a/examples/barchart/barchart.cpp +++ b/examples/barchart/barchart.cpp @@ -102,8 +102,14 @@ void doExample() int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + doExample(); doExample(); diff --git a/examples/boxplot/boxplot.cpp b/examples/boxplot/boxplot.cpp index 27e39ad009..bc49a8d138 100644 --- a/examples/boxplot/boxplot.cpp +++ b/examples/boxplot/boxplot.cpp @@ -11,8 +11,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; plot.getPlotter()->setUseAntiAliasingForGraphs(true); // nicer (but slower) plotting diff --git a/examples/contourplot/contourplot.cpp b/examples/contourplot/contourplot.cpp index 59a53437d1..0334927733 100644 --- a/examples/contourplot/contourplot.cpp +++ b/examples/contourplot/contourplot.cpp @@ -19,9 +19,15 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; plot.getPlotter()->setUseAntiAliasingForGraphs(true); // nicer (but slower) plotting diff --git a/examples/datastore/datastore.cpp b/examples/datastore/datastore.cpp index 4bb7ef00ee..8397187b21 100644 --- a/examples/datastore/datastore.cpp +++ b/examples/datastore/datastore.cpp @@ -12,8 +12,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* datastore=plot.getDatastore(); diff --git a/examples/datastore_groupedstat/datastore_groupedstat.cpp b/examples/datastore_groupedstat/datastore_groupedstat.cpp index ee23aca078..dfc5ff73b8 100644 --- a/examples/datastore_groupedstat/datastore_groupedstat.cpp +++ b/examples/datastore_groupedstat/datastore_groupedstat.cpp @@ -18,9 +18,15 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a window with several plotters and get a pointer to the internal datastores (for convenience) QWidget mainWidget; QGridLayout* lay; diff --git a/examples/datastore_iterators/datastore_iterators.cpp b/examples/datastore_iterators/datastore_iterators.cpp index dad883153f..9df46f70e2 100644 --- a/examples/datastore_iterators/datastore_iterators.cpp +++ b/examples/datastore_iterators/datastore_iterators.cpp @@ -12,8 +12,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* datastore=plot.getDatastore(); diff --git a/examples/datastore_regression/datastore_regression.cpp b/examples/datastore_regression/datastore_regression.cpp index 4dd9f88ff2..3e3d07c369 100644 --- a/examples/datastore_regression/datastore_regression.cpp +++ b/examples/datastore_regression/datastore_regression.cpp @@ -18,9 +18,15 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a window with several plotters and get a pointer to the internal datastores (for convenience) QWidget mainWidget; QGridLayout* lay; diff --git a/examples/datastore_statistics/datastore_statistics.cpp b/examples/datastore_statistics/datastore_statistics.cpp index b55d7dcb17..3d7e6dd8bc 100644 --- a/examples/datastore_statistics/datastore_statistics.cpp +++ b/examples/datastore_statistics/datastore_statistics.cpp @@ -18,9 +18,15 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a window with several plotters and get a pointer to the internal datastores (for convenience) QWidget mainWidget; QGridLayout* lay; diff --git a/examples/datastore_statistics_2d/datastore_statistics_2d.cpp b/examples/datastore_statistics_2d/datastore_statistics_2d.cpp index 60bc85f22f..e2a80c75cf 100644 --- a/examples/datastore_statistics_2d/datastore_statistics_2d.cpp +++ b/examples/datastore_statistics_2d/datastore_statistics_2d.cpp @@ -18,7 +18,13 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + QElapsedTimer timer; diff --git a/examples/dateaxes/dateaxes.cpp b/examples/dateaxes/dateaxes.cpp index 588fdce861..8509af9c6a 100644 --- a/examples/dateaxes/dateaxes.cpp +++ b/examples/dateaxes/dateaxes.cpp @@ -168,7 +168,13 @@ void drawWithTimeAxis(JKQTPlotter& plot) { int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + JKQTPlotter plotDate; drawWithDateAxis(plotDate); plotDate.move(100,100); diff --git a/examples/distributionplot/test_distributionplot.cpp b/examples/distributionplot/test_distributionplot.cpp index 67ea1a671b..e955830088 100644 --- a/examples/distributionplot/test_distributionplot.cpp +++ b/examples/distributionplot/test_distributionplot.cpp @@ -17,8 +17,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; plot.getPlotter()->setUseAntiAliasingForGraphs(true); // nicer (but slower) plotting diff --git a/examples/errorbarstyles/errorbarstyles.cpp b/examples/errorbarstyles/errorbarstyles.cpp index 848bf3bd14..718dcbbe8a 100644 --- a/examples/errorbarstyles/errorbarstyles.cpp +++ b/examples/errorbarstyles/errorbarstyles.cpp @@ -12,8 +12,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/evalcurve/evalcurve.cpp b/examples/evalcurve/evalcurve.cpp index c22db16202..2704d23461 100644 --- a/examples/evalcurve/evalcurve.cpp +++ b/examples/evalcurve/evalcurve.cpp @@ -13,8 +13,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a window that contains a line-edit to edit a function // and a JKQTPlotter to display the function, combine everything in a layout QWidget mainWin; diff --git a/examples/filledgraphs/filledgraphs.cpp b/examples/filledgraphs/filledgraphs.cpp index 96b90bec65..3664e484bc 100644 --- a/examples/filledgraphs/filledgraphs.cpp +++ b/examples/filledgraphs/filledgraphs.cpp @@ -10,8 +10,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/functionplot/functionplot.cpp b/examples/functionplot/functionplot.cpp index 7698c8a1c3..c1a5972f35 100644 --- a/examples/functionplot/functionplot.cpp +++ b/examples/functionplot/functionplot.cpp @@ -134,8 +134,14 @@ void drawExample(QApplication& app, const QString& name) { int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + drawExample(app, "functionplot: JKQTPXFunctionLineGraph"); drawExample(app, "functionplot: JKQTPYFunctionLineGraph"); diff --git a/examples/geo_arrows/geo_arrows.cpp b/examples/geo_arrows/geo_arrows.cpp index f03d712352..855991ed85 100644 --- a/examples/geo_arrows/geo_arrows.cpp +++ b/examples/geo_arrows/geo_arrows.cpp @@ -12,8 +12,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window JKQTPlotter plot; diff --git a/examples/geo_simple/geo_simple.cpp b/examples/geo_simple/geo_simple.cpp index 5768deddd4..7b320de627 100644 --- a/examples/geo_simple/geo_simple.cpp +++ b/examples/geo_simple/geo_simple.cpp @@ -84,8 +84,14 @@ void drawEllExample(JKQTPlotter* plot, double x0, double y0, double wid, double int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a Widget with a plotter and some control-elements QWidget widMain; QGridLayout* layMain=new QGridLayout; diff --git a/examples/geometric/geometric.cpp b/examples/geometric/geometric.cpp index a8d0b59824..8cc436ced4 100644 --- a/examples/geometric/geometric.cpp +++ b/examples/geometric/geometric.cpp @@ -12,8 +12,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a Widget with a plotter and some control-elements QWidget widMain; QGridLayout* layMain=new QGridLayout; diff --git a/examples/imageplot/imageplot.cpp b/examples/imageplot/imageplot.cpp index 316a6c7a99..b2a161edbf 100644 --- a/examples/imageplot/imageplot.cpp +++ b/examples/imageplot/imageplot.cpp @@ -12,8 +12,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + JKQTPlotter plot; // 1. create a plotter window and get a pointer to the internal datastore (for convenience) plot.getPlotter()->setUseAntiAliasingForGraphs(true); // nicer (but slower) plotting diff --git a/examples/imageplot_modifier/imageplot_modifier.cpp b/examples/imageplot_modifier/imageplot_modifier.cpp index 300fceacc0..8a0b046466 100644 --- a/examples/imageplot_modifier/imageplot_modifier.cpp +++ b/examples/imageplot_modifier/imageplot_modifier.cpp @@ -11,8 +11,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + JKQTPlotter plot; // 1. create a plotter window and get a pointer to the internal datastore (for convenience) plot.getPlotter()->setUseAntiAliasingForGraphs(true); // nicer (but slower) plotting diff --git a/examples/imageplot_nodatastore/imageplot_nodatastore.cpp b/examples/imageplot_nodatastore/imageplot_nodatastore.cpp index e37e3c4069..a059204a42 100644 --- a/examples/imageplot_nodatastore/imageplot_nodatastore.cpp +++ b/examples/imageplot_nodatastore/imageplot_nodatastore.cpp @@ -11,8 +11,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + JKQTPlotter plot; // 1. create a plotter window and get a pointer to the internal datastore (for convenience) plot.getPlotter()->setUseAntiAliasingForGraphs(true); // nicer (but slower) plotting diff --git a/examples/imageplot_userpal/imageplot_userpal.cpp b/examples/imageplot_userpal/imageplot_userpal.cpp index 85057dd361..c95b7503cd 100644 --- a/examples/imageplot_userpal/imageplot_userpal.cpp +++ b/examples/imageplot_userpal/imageplot_userpal.cpp @@ -17,8 +17,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 0. tell the library where to find additional palettes. // this needs to be done BEFORE first using JKQTPlotter // 0.1 first we want to build a user-defined palette with five colors diff --git a/examples/impulsesplot/impulsesplot.cpp b/examples/impulsesplot/impulsesplot.cpp index ca079c182f..40595d22f2 100644 --- a/examples/impulsesplot/impulsesplot.cpp +++ b/examples/impulsesplot/impulsesplot.cpp @@ -13,8 +13,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.cpp b/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.cpp index 211ac451f5..c4bde330aa 100644 --- a/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.cpp +++ b/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.cpp @@ -11,8 +11,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // we use a simple label to display the math text QLabel lab; diff --git a/examples/jkqtmathtext_test/jkqtmathtext_test.cpp b/examples/jkqtmathtext_test/jkqtmathtext_test.cpp index 97970aaa3b..a2032e8523 100644 --- a/examples/jkqtmathtext_test/jkqtmathtext_test.cpp +++ b/examples/jkqtmathtext_test/jkqtmathtext_test.cpp @@ -3,8 +3,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + TestForm w; w.show(); w.updateMath(); diff --git a/examples/jkqtplot_test/jkqtplot_test.cpp b/examples/jkqtplot_test/jkqtplot_test.cpp index 3d940844fd..6301ad2c7a 100644 --- a/examples/jkqtplot_test/jkqtplot_test.cpp +++ b/examples/jkqtplot_test/jkqtplot_test.cpp @@ -5,8 +5,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + TestMain tab; tab.show(); diff --git a/examples/logaxes/logaxes.cpp b/examples/logaxes/logaxes.cpp index 90ed37a8a5..22853f2029 100644 --- a/examples/logaxes/logaxes.cpp +++ b/examples/logaxes/logaxes.cpp @@ -14,8 +14,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/mandelbrot/mandelbrot.cpp b/examples/mandelbrot/mandelbrot.cpp index 191027258a..ad0cf6b922 100644 --- a/examples/mandelbrot/mandelbrot.cpp +++ b/examples/mandelbrot/mandelbrot.cpp @@ -12,7 +12,13 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + MandelbrotMainWindow widMain; widMain.show(); diff --git a/examples/multiplot/test_multiplot.cpp b/examples/multiplot/test_multiplot.cpp index 8a7e9fbbda..70561e3748 100644 --- a/examples/multiplot/test_multiplot.cpp +++ b/examples/multiplot/test_multiplot.cpp @@ -15,8 +15,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a widget QWidget mainWidget; mainWidget.setWindowTitle("JKQTPlotter(s) in a QGridLayout"); diff --git a/examples/parametriccurve/parametriccurve.cpp b/examples/parametriccurve/parametriccurve.cpp index 915f434765..bfd1204a7a 100644 --- a/examples/parametriccurve/parametriccurve.cpp +++ b/examples/parametriccurve/parametriccurve.cpp @@ -11,8 +11,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create two plotter windows that share the same internal datastore (for convenience) JKQTPlotter plot, plot2; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/paramscatterplot/paramscatterplot.cpp b/examples/paramscatterplot/paramscatterplot.cpp index c2628c9429..a8ab58efe6 100644 --- a/examples/paramscatterplot/paramscatterplot.cpp +++ b/examples/paramscatterplot/paramscatterplot.cpp @@ -11,8 +11,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/paramscatterplot_image/paramscatterplot_image.cpp b/examples/paramscatterplot_image/paramscatterplot_image.cpp index cca6471b0f..836df15414 100644 --- a/examples/paramscatterplot_image/paramscatterplot_image.cpp +++ b/examples/paramscatterplot_image/paramscatterplot_image.cpp @@ -12,8 +12,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/parsedfunctionplot/parsedfunctionplot.cpp b/examples/parsedfunctionplot/parsedfunctionplot.cpp index 4023495f86..68a2284508 100644 --- a/examples/parsedfunctionplot/parsedfunctionplot.cpp +++ b/examples/parsedfunctionplot/parsedfunctionplot.cpp @@ -17,8 +17,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a window that conatins a line-edit to edit a function // and a JKQTPlotter to display the function, combine everything in a layout QWidget mainWin; diff --git a/examples/rgbimageplot/rgbimageplot.cpp b/examples/rgbimageplot/rgbimageplot.cpp index 1ecc30202b..421351b635 100644 --- a/examples/rgbimageplot/rgbimageplot.cpp +++ b/examples/rgbimageplot/rgbimageplot.cpp @@ -13,8 +13,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + JKQTPlotter plot; // 1. create a plotter window and get a pointer to the internal datastore (for convenience) plot.getPlotter()->setUseAntiAliasingForGraphs(true); // nicer (but slower) plotting diff --git a/examples/rgbimageplot_qt/rgbimageplot_qt.cpp b/examples/rgbimageplot_qt/rgbimageplot_qt.cpp index a8c9450afa..9acafffde1 100644 --- a/examples/rgbimageplot_qt/rgbimageplot_qt.cpp +++ b/examples/rgbimageplot_qt/rgbimageplot_qt.cpp @@ -14,8 +14,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + JKQTPlotter plot; diff --git a/examples/simpletest/simpletest.cpp b/examples/simpletest/simpletest.cpp index 808299b393..1ca6af385b 100644 --- a/examples/simpletest/simpletest.cpp +++ b/examples/simpletest/simpletest.cpp @@ -11,8 +11,20 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif + + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); @@ -47,6 +59,7 @@ int main(int argc, char* argv[]) plot.zoomToFit(); // show plotter and make it a decent size + plot.getPlotter()->setPlotLabel(QObject::tr("Graph Title")); plot.show(); plot.resize(600,400); diff --git a/examples/speed/speed.cpp b/examples/speed/speed.cpp index 7d8ecae83a..6ea8023afe 100644 --- a/examples/speed/speed.cpp +++ b/examples/speed/speed.cpp @@ -7,8 +7,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) SpeedTestPlot plot; diff --git a/examples/stackedbars/stackedbars.cpp b/examples/stackedbars/stackedbars.cpp index 920933c9e7..a343d28b9c 100644 --- a/examples/stackedbars/stackedbars.cpp +++ b/examples/stackedbars/stackedbars.cpp @@ -102,8 +102,14 @@ void addGraph(JKQTPlotter& plot, bool swapXY) { int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + JKQTPlotter plotV; addGraph(plotV, false); plotV.setWindowTitle("JKQTPBarVerticalStackableGraph"); diff --git a/examples/stepplots/stepplots.cpp b/examples/stepplots/stepplots.cpp index 4eecd0c0ca..a86d82d508 100644 --- a/examples/stepplots/stepplots.cpp +++ b/examples/stepplots/stepplots.cpp @@ -12,8 +12,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/styledboxplot/test_styledboxplot.cpp b/examples/styledboxplot/test_styledboxplot.cpp index 39a7d05188..433236978e 100644 --- a/examples/styledboxplot/test_styledboxplot.cpp +++ b/examples/styledboxplot/test_styledboxplot.cpp @@ -11,8 +11,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; plot.getPlotter()->setUseAntiAliasingForGraphs(true); // nicer (but slower) plotting diff --git a/examples/styling/test_styling_main.cpp b/examples/styling/test_styling_main.cpp index ffb1a580f6..0a5c6beb30 100644 --- a/examples/styling/test_styling_main.cpp +++ b/examples/styling/test_styling_main.cpp @@ -5,8 +5,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // you can set the system-wide default style properties early on // all JKQTPlotter instance created after this, will use these // settings as their initial settings diff --git a/examples/symbols_and_errors/symbols_and_errors.cpp b/examples/symbols_and_errors/symbols_and_errors.cpp index 0ad4c5b392..a9c4548b35 100644 --- a/examples/symbols_and_errors/symbols_and_errors.cpp +++ b/examples/symbols_and_errors/symbols_and_errors.cpp @@ -13,8 +13,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/symbols_and_styles/symbols_and_styles.cpp b/examples/symbols_and_styles/symbols_and_styles.cpp index e2f8833167..c2574323d5 100644 --- a/examples/symbols_and_styles/symbols_and_styles.cpp +++ b/examples/symbols_and_styles/symbols_and_styles.cpp @@ -12,8 +12,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + // 1. create a plotter window and get a pointer to the internal datastore (for convenience) JKQTPlotter plot; JKQTPDatastore* ds=plot.getDatastore(); diff --git a/examples/ui/ui.cpp b/examples/ui/ui.cpp index ff26f6652a..c39fa12c82 100644 --- a/examples/ui/ui.cpp +++ b/examples/ui/ui.cpp @@ -4,8 +4,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + FormWithJKQTPlotter plot; plot.show(); plot.resize(600,400); diff --git a/examples/user_interaction/test_user_interaction_main.cpp b/examples/user_interaction/test_user_interaction_main.cpp index 5fb5df82c2..25a6493ddc 100644 --- a/examples/user_interaction/test_user_interaction_main.cpp +++ b/examples/user_interaction/test_user_interaction_main.cpp @@ -4,8 +4,14 @@ int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + TestUserInteraction win; win.show(); diff --git a/examples/violinplot/violinplot.cpp b/examples/violinplot/violinplot.cpp index e778d35703..25aabd9321 100644 --- a/examples/violinplot/violinplot.cpp +++ b/examples/violinplot/violinplot.cpp @@ -163,8 +163,14 @@ JKQTPlotter* showPlot() { int main(int argc, char* argv[]) { + +#if QT_VERSION >= 0x050600 + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps +#endif QApplication app(argc, argv); + showPlot(); showPlot(); From 29101b63fdaa88d3e726ee50016bac2d12df25b4 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Fri, 15 Apr 2022 23:06:09 +0200 Subject: [PATCH 04/12] added debug output to appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index ed6c924d0a..474630f666 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -72,6 +72,7 @@ install: ) ) - set PATH=C:\Qt\%QTVER%\%QTABI%\bin;%JOMDIR%;%PATH% + - echo "PATH = %PATH%" - echo "BUILD ID Qt%QTVER%_%QTABI%_%APPVEYOR_BUILD_VERSION%_%CONFIGURATION%" # Rename sh.exe as sh.exe in PATH interferes with MinGW - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" From 786f1a790c9a0ef1a9b1a2539c31f3080e79df9f Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Fri, 15 Apr 2022 23:10:20 +0200 Subject: [PATCH 05/12] added debug output to appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 474630f666..12b0ea6e3b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -73,6 +73,7 @@ install: ) - set PATH=C:\Qt\%QTVER%\%QTABI%\bin;%JOMDIR%;%PATH% - echo "PATH = %PATH%" + - echo "APPVEYOR_BUILD_WORKER_IMAGE = %APPVEYOR_BUILD_WORKER_IMAGE%" - echo "BUILD ID Qt%QTVER%_%QTABI%_%APPVEYOR_BUILD_VERSION%_%CONFIGURATION%" # Rename sh.exe as sh.exe in PATH interferes with MinGW - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" From 24f764616d6c341ba0cb326cf18dc82e4065633a Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sat, 16 Apr 2022 23:23:18 +0200 Subject: [PATCH 06/12] update appveyor.yml, added Qt 5.15 & Unix --- appveyor.yml | 325 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 217 insertions(+), 108 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 12b0ea6e3b..ec9ea9e039 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,126 +1,235 @@ -version: 0.{build}-{branch} - - -environment: - global: - JOMDIR: C:\Qt\Tools\QtCreator\bin - MINGWDIR: C:\Qt\Tools\mingw530_32 - VSVER: 0 - USE_LINUX: false - - matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - QTABI: mingw53_32 - QTVER: 5.11 - ARCH: x86 - MAKETOOL: mingw32-make - CMAKE_GENERATOR: "MinGW Makefiles" - USE_CMAKE: true - MSBUILD_FLAGS: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - QTABI: msvc2017_64 - QTVER: 5.11 - ARCH: x64 - VSVER: 2017 - CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" - USE_CMAKE: true - MSBUILD_FLAGS: /verbosity:minimal /maxcpucount - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - QTABI: msvc2019_64 - QTVER: 5.15.2 - ARCH: x64 - VSVER: 2019 - CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - USE_CMAKE: true - MSBUILD_FLAGS: /verbosity:minimal /maxcpucount - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - QTABI: msvc2015 - QTVER: 5.11 - ARCH: x86 - VSVER: 14 - CMAKE_GENERATOR: "Visual Studio 15 2017" - USE_CMAKE: true - MSBUILD_FLAGS: /verbosity:minimal /maxcpucount - # - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - # QTABI: gcc_64 - # QTVER: 5.15.2 - # ARCH: x64 - # CMAKE_GENERATOR: "Unix Makefiles" - # USE_CMAKE: true - # USE_LINUX: true - +version: {branch}-0.{build} +# don't build tags skip_tags: true + +# build options build: parallel: true verbosity: detailed + +#configurations to build configuration: - release # - debug -install: - - IF %VSVER% GTR 14 ( - call "C:\Program Files (x86)\Microsoft Visual Studio\%VSVER%\Community\VC\Auxiliary\Build\vcvarsall.bat" %ARCH% - ) ELSE ( - IF %VSVER% GTR 0 ( - call "C:\Program Files (x86)\Microsoft Visual Studio "%VSVER%".0\VC\vcvarsall.bat" %ARCH% - ) ELSE ( - set "PATH=%MINGWDIR%\bin;%PATH%" - ) - ) - - set PATH=C:\Qt\%QTVER%\%QTABI%\bin;%JOMDIR%;%PATH% - - echo "PATH = %PATH%" - - echo "APPVEYOR_BUILD_WORKER_IMAGE = %APPVEYOR_BUILD_WORKER_IMAGE%" - - echo "BUILD ID Qt%QTVER%_%QTABI%_%APPVEYOR_BUILD_VERSION%_%CONFIGURATION%" - # Rename sh.exe as sh.exe in PATH interferes with MinGW - - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - - cmd: choco install OpenCV - - cmd: set OPENCV_DIR=C:\tools\opencv\build +# define build matrix +environment: + global: + JOMDIR: C:\Qt\Tools\QtCreator\bin + VSVER: 0 + CMAKE_BUILDFLAGS: /verbosity:minimal /maxcpucount + USE_CMAKE: true + + matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + QTABI: mingw53_32 + ARCH: x32 + MINGWDIR: C:\Qt\Tools\mingw530_32 + QTVER: 5.11 + MAKETOOL: mingw32-make + CMAKE_GENERATOR: "MinGW Makefiles" + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + QTABI: msvc2015_64 + ARCH: x64 + QTVER: 5.11 + CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" -build_script: -# - dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\include" -# - type "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\include\random" -# - dir "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE" -# - type "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\random" - - dir c:\Qt\ - - mkdir build - - cd build - - if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=Release) else (set CMAKE_CONFIGURATION=Debug) - - if [%USE_CMAKE%]==[true] ( - echo "Call CMake..." - cmake --version && - cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QT5%" .. && - echo "Build..." && - cmake --build . --config "%CMAKE_CONFIGURATION%" -- %MSBUILD_FLAGS% ) - else ( - echo "Call QMake..." && - qmake.exe -v && - qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - echo "Build..." && - call %MAKETOOL% && - cd ..) + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + QTABI: msvc2015 + ARCH: x32 + QTVER: 5.11 + CMAKE_GENERATOR: "Visual Studio 15 2017" + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + QTABI: msvc2019_64 + ARCH: x64 + QTVER: 5.15 + CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + QTABI: mingw81_64 + ARCH: x64 + MINGWDIR: C:\Qt\Tools\mingw810_64 + QTVER: 5.15 + CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" -#artifacts: -# - path: build\staticlib\**\*.a -# name: staticlib %QTVER%%QTABI% -# - path: build\sharedlib\**\*.a -# name: sharedlib %QTVER%%QTABI% -# - path: build\staticlib\**\*.lib -# name: staticlib %QTVER%%QTABI% -# - path: build\sharedlib\**\*.lib -# name: sharedlib %QTVER%%QTABI% -# - path: build\sharedlib\**\*.dll -# name: dll %QTVER%%QTABI% + - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + QTABI: gcc_64 + ARCH: x64 + QTVER: 5.15 + CMAKE_GENERATOR: "Unix Makefiles" + + +for: + # Windows (MinGW 5.3 & MSVC2015) + - matrix: + only: + - image: Visual Studio 2019 + + clone_folder: c:\Build\JKQtPlotter + + init: + - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== + - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% + - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% + - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% + - cmd: echo ARCH=%ARCH% + - cmd: echo QTABI=%QTABI% + - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% + - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% + + install: + # Init compiler environment + - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== + - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin + - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% + - cmd: if /i "%QTABI:~0:5%"=="mingw" set "PATH=%MINGWDIR%\bin;%PATH%" + - cmd: if %QTABI%==msvc2015 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 + - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 + - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 + # Rename sh.exe as sh.exe in PATH interferes with MinGW + - cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" + - cmd: if /i "%QTABI:~0:5%"=="mingw" echo "USING MINGW: %QTABI%" + - cmd: if /i "%QTABI:~0:4%"=="msvc" echo "USING MSVC: %QTABI%" + - cmd: echo QTDIR=%QTDIR% + - cmd: echo JOMDIR=%JOMDIR% + - cmd: echo PATH=%PATH% + - cmd: echo == INSTALL OPENCV =============================================================================== + # Install OpenCV + - cmd: choco install OpenCV + - cmd: set OPENCV_DIR=C:\tools\opencv\build + - cmd: echo OPENCV_DIR=%OPENCV_DIR% + + build_script: + - cmd: echo == BUILD JKQtPlotter ============================================================================ + - cd c:\Build\JKQtPlotter + - mkdir build + - cd build + - if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=Release) else (set CMAKE_CONFIGURATION=Debug) + - if [%USE_CMAKE%]==[true] ( + echo "--- Run CMake Configure -----------------------------------------------------------------------------" && + cmake --version && + cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + echo "--- Build using CMake -------------------------------------------------------------------------------" && + cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + else ( + echo "--- Run QMake Configure -----------------------------------------------------------------------------" && + qmake.exe -v && + qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && + echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && + call %MAKETOOL% && + cd ..) -# # remote desktop connection on init -# init: - # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) -# # remote desktop connection on finish and block build to not destroy VM -# on_finish: - # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + # Windows (MinGW 8.1 & MSVC2019) + - matrix: + only: + - image: Visual Studio 2022 + + clone_folder: c:\Build\JKQtPlotter + + + init: + - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== + - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% + - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% + - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% + - cmd: echo ARCH=%ARCH% + - cmd: echo QTABI=%QTABI% + - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% + - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% + + install: + # Init compiler environment + - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== + - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin + - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% + - cmd: if /i "%QTABI:~0:5%"=="mingw" set "PATH=%MINGWDIR%\bin;%PATH%" + - cmd: if %QTABI%==msvc2019 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" + - cmd: if %QTABI%==msvc2019_64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" + # Rename sh.exe as sh.exe in PATH interferes with MinGW + - cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" + - cmd: if /i "%QTABI:~0:5%"=="mingw" echo "USING MINGW: %QTABI%" + - cmd: if /i "%QTABI:~0:4%"=="msvc" echo "USING MSVC: %QTABI%" + - cmd: echo QTDIR=%QTDIR% + - cmd: echo JOMDIR=%JOMDIR% + - cmd: echo PATH=%PATH% + - cmd: echo == INSTALL OPENCV =============================================================================== + # Install OpenCV + - cmd: choco install OpenCV + - cmd: set OPENCV_DIR=C:\tools\opencv\build + - cmd: echo OPENCV_DIR=%OPENCV_DIR% + + + build_script: + - cmd: echo == BUILD JKQtPlotter ============================================================================ + - cd c:\Build\JKQtPlotter + - mkdir build + - cd build + - if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=Release) else (set CMAKE_CONFIGURATION=Debug) + - if [%USE_CMAKE%]==[true] ( + echo "--- Run CMake Configure -----------------------------------------------------------------------------" && + cmake --version && + cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + echo "--- Build using CMake -------------------------------------------------------------------------------" && + cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + else ( + echo "--- Run QMake Configure -----------------------------------------------------------------------------" && + qmake.exe -v && + qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && + echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && + call %MAKETOOL% && + cd ..) + + + + + + # Linux (Ubuntu2004) + - matrix: + only: + - image: Ubuntu2004 + + clone_folder: ~/JKQtPlotter + + + init: + - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== + - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) + - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% + - sh: echo ARCH=%ARCH% + - sh: echo QTABI=%QTABI% + - sh: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% + + install: + # Init compiler environment + - sh: echo == INIT COMPILER ENVIRONMENT ==================================================================== + - sh: sudo apt update -qq + - sh: sudo apt install -y build-essential git qt5-qmake cmake ninja-build + - cmd: echo QTDIR=%QTDIR% + - cmd: echo PATH=%PATH% + - cmd: echo == INSTALL OPENCV =============================================================================== + # Install OpenCV + - sh: sudo apt install -y opencv + - sh: echo OPENCV_DIR=%OPENCV_DIR% + + + build_script: + - sh: echo == BUILD JKQtPlotter ============================================================================ + - sh: cd ~/JKQtPlotter + - sh: mkdir build + - sh: cd build + - sh: if [[ $CONFIGURATION release ]]; then export CMAKE_CONFIGURATION=Release; fi + - sh: if [[ $CONFIGURATION debug ]]; then export CMAKE_CONFIGURATION=Debug; fi + - sh: echo "--- Run CMake Configure -----------------------------------------------------------------------------" && + - sh: cmake --version && + - sh: cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + - sh: echo "--- Build using CMake -------------------------------------------------------------------------------" && + - sh: cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) From 1bbbe3564f4a09ef7175e75273b42306f45e9a9d Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sat, 16 Apr 2022 23:31:00 +0200 Subject: [PATCH 07/12] corrected appveyor.yml: Unix-Build (calculating Qt path) --- appveyor.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ec9ea9e039..e4b4082fda 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: {branch}-0.{build} +version: 0.{build}-{branch} # don't build tags skip_tags: true @@ -27,7 +27,6 @@ environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 QTABI: mingw53_32 - ARCH: x32 MINGWDIR: C:\Qt\Tools\mingw530_32 QTVER: 5.11 MAKETOOL: mingw32-make @@ -35,34 +34,30 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 QTABI: msvc2015_64 - ARCH: x64 QTVER: 5.11 CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 QTABI: msvc2015 - ARCH: x32 QTVER: 5.11 CMAKE_GENERATOR: "Visual Studio 15 2017" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 QTABI: msvc2019_64 - ARCH: x64 QTVER: 5.15 CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 QTABI: mingw81_64 - ARCH: x64 MINGWDIR: C:\Qt\Tools\mingw810_64 QTVER: 5.15 CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 QTABI: gcc_64 - ARCH: x64 QTVER: 5.15 CMAKE_GENERATOR: "Unix Makefiles" + for: @@ -78,7 +73,6 @@ for: - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% - - cmd: echo ARCH=%ARCH% - cmd: echo QTABI=%QTABI% - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% @@ -94,8 +88,6 @@ for: - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 # Rename sh.exe as sh.exe in PATH interferes with MinGW - cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - - cmd: if /i "%QTABI:~0:5%"=="mingw" echo "USING MINGW: %QTABI%" - - cmd: if /i "%QTABI:~0:4%"=="msvc" echo "USING MSVC: %QTABI%" - cmd: echo QTDIR=%QTDIR% - cmd: echo JOMDIR=%JOMDIR% - cmd: echo PATH=%PATH% @@ -141,7 +133,6 @@ for: - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% - - cmd: echo ARCH=%ARCH% - cmd: echo QTABI=%QTABI% - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% @@ -156,8 +147,6 @@ for: - cmd: if %QTABI%==msvc2019_64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" # Rename sh.exe as sh.exe in PATH interferes with MinGW - cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - - cmd: if /i "%QTABI:~0:5%"=="mingw" echo "USING MINGW: %QTABI%" - - cmd: if /i "%QTABI:~0:4%"=="msvc" echo "USING MSVC: %QTABI%" - cmd: echo QTDIR=%QTDIR% - cmd: echo JOMDIR=%JOMDIR% - cmd: echo PATH=%PATH% @@ -204,13 +193,13 @@ for: - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% - - sh: echo ARCH=%ARCH% - sh: echo QTABI=%QTABI% - sh: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% install: # Init compiler environment - sh: echo == INIT COMPILER ENVIRONMENT ==================================================================== + - sh: set QTDIR=$HOME/Qt/%QTVER%/%QTABI%/bin - sh: sudo apt update -qq - sh: sudo apt install -y build-essential git qt5-qmake cmake ninja-build - cmd: echo QTDIR=%QTDIR% From 22ac8fced06423786c0f475e0f8c221941df240d Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sat, 16 Apr 2022 23:51:05 +0200 Subject: [PATCH 08/12] tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script --- appveyor.yml | 110 +++++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 61 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e4b4082fda..9a242b5c09 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ build: #configurations to build configuration: - - release + - Release # - debug @@ -27,6 +27,7 @@ environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 QTABI: mingw53_32 + COMPILER: MinGW MINGWDIR: C:\Qt\Tools\mingw530_32 QTVER: 5.11 MAKETOOL: mingw32-make @@ -34,27 +35,32 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 QTABI: msvc2015_64 + COMPILER: MSVC QTVER: 5.11 CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 QTABI: msvc2015 + COMPILER: MSVC QTVER: 5.11 CMAKE_GENERATOR: "Visual Studio 15 2017" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 QTABI: msvc2019_64 + COMPILER: MSVC QTVER: 5.15 CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 QTABI: mingw81_64 + COMPILER: MinGW MINGWDIR: C:\Qt\Tools\mingw810_64 QTVER: 5.15 CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 QTABI: gcc_64 + COMPILER: gcc QTVER: 5.15 CMAKE_GENERATOR: "Unix Makefiles" @@ -62,11 +68,10 @@ environment: for: # Windows (MinGW 5.3 & MSVC2015) - - matrix: + - + matrix: only: - - image: Visual Studio 2019 - - clone_folder: c:\Build\JKQtPlotter + - image: Visual Studio 2019 init: - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== @@ -82,12 +87,12 @@ for: - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% - - cmd: if /i "%QTABI:~0:5%"=="mingw" set "PATH=%MINGWDIR%\bin;%PATH%" + - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" - cmd: if %QTABI%==msvc2015 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 # Rename sh.exe as sh.exe in PATH interferes with MinGW - - cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" + - cmd: if %COMPILER%==MinGW rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - cmd: echo QTDIR=%QTDIR% - cmd: echo JOMDIR=%JOMDIR% - cmd: echo PATH=%PATH% @@ -99,34 +104,28 @@ for: build_script: - cmd: echo == BUILD JKQtPlotter ============================================================================ - - cd c:\Build\JKQtPlotter - - mkdir build - - cd build - - if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=Release) else (set CMAKE_CONFIGURATION=Debug) - - if [%USE_CMAKE%]==[true] ( - echo "--- Run CMake Configure -----------------------------------------------------------------------------" && - cmake --version && - cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - echo "--- Build using CMake -------------------------------------------------------------------------------" && - cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - else ( - echo "--- Run QMake Configure -----------------------------------------------------------------------------" && - qmake.exe -v && - qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && - call %MAKETOOL% && - cd ..) + - cmd: mkdir build + - cmd: cd build + - cmd: if [%USE_CMAKE%]==[true] echo "--- Run CMake Configure -----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[true] cmake --version && + - cmd: if [%USE_CMAKE%]==[true] cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + - cmd: if [%USE_CMAKE%]==[true] echo "--- Build using CMake -------------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[true] cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + - cmd: if [%USE_CMAKE%]==[false] echo "--- Run QMake Configure -----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[false] qmake.exe -v && + - cmd: if [%USE_CMAKE%]==[false] qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && + - cmd: if [%USE_CMAKE%]==[false] echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[false] call %MAKETOOL% && + - cmd: cd .. # Windows (MinGW 8.1 & MSVC2019) - - matrix: + - + matrix: only: - image: Visual Studio 2022 - - clone_folder: c:\Build\JKQtPlotter - init: - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== @@ -142,11 +141,11 @@ for: - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% - - cmd: if /i "%QTABI:~0:5%"=="mingw" set "PATH=%MINGWDIR%\bin;%PATH%" + - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" - cmd: if %QTABI%==msvc2019 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" - cmd: if %QTABI%==msvc2019_64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" # Rename sh.exe as sh.exe in PATH interferes with MinGW - - cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" + - cmd: if %COMPILER%==MinGW rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - cmd: echo QTDIR=%QTDIR% - cmd: echo JOMDIR=%JOMDIR% - cmd: echo PATH=%PATH% @@ -156,39 +155,32 @@ for: - cmd: set OPENCV_DIR=C:\tools\opencv\build - cmd: echo OPENCV_DIR=%OPENCV_DIR% - build_script: - cmd: echo == BUILD JKQtPlotter ============================================================================ - - cd c:\Build\JKQtPlotter - - mkdir build - - cd build - - if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=Release) else (set CMAKE_CONFIGURATION=Debug) - - if [%USE_CMAKE%]==[true] ( - echo "--- Run CMake Configure -----------------------------------------------------------------------------" && - cmake --version && - cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - echo "--- Build using CMake -------------------------------------------------------------------------------" && - cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - else ( - echo "--- Run QMake Configure -----------------------------------------------------------------------------" && - qmake.exe -v && - qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && - call %MAKETOOL% && - cd ..) + - cmd: mkdir build + - cmd: cd build + - cmd: if [%USE_CMAKE%]==[true] echo "--- Run CMake Configure -----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[true] cmake --version && + - cmd: if [%USE_CMAKE%]==[true] cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + - cmd: if [%USE_CMAKE%]==[true] echo "--- Build using CMake -------------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[true] cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + - cmd: if [%USE_CMAKE%]==[false] echo "--- Run QMake Configure -----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[false] qmake.exe -v && + - cmd: if [%USE_CMAKE%]==[false] qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && + - cmd: if [%USE_CMAKE%]==[false] echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[false] call %MAKETOOL% && + - cmd: cd .. # Linux (Ubuntu2004) - - matrix: + - + matrix: only: - image: Ubuntu2004 - - clone_folder: ~/JKQtPlotter - - + init: - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) @@ -202,23 +194,19 @@ for: - sh: set QTDIR=$HOME/Qt/%QTVER%/%QTABI%/bin - sh: sudo apt update -qq - sh: sudo apt install -y build-essential git qt5-qmake cmake ninja-build - - cmd: echo QTDIR=%QTDIR% - - cmd: echo PATH=%PATH% - - cmd: echo == INSTALL OPENCV =============================================================================== + - sh: echo QTDIR=%QTDIR% + - sh: echo PATH=%PATH% + - sh: echo == INSTALL OPENCV =============================================================================== # Install OpenCV - sh: sudo apt install -y opencv - sh: echo OPENCV_DIR=%OPENCV_DIR% - build_script: - sh: echo == BUILD JKQtPlotter ============================================================================ - - sh: cd ~/JKQtPlotter - sh: mkdir build - sh: cd build - - sh: if [[ $CONFIGURATION release ]]; then export CMAKE_CONFIGURATION=Release; fi - - sh: if [[ $CONFIGURATION debug ]]; then export CMAKE_CONFIGURATION=Debug; fi - sh: echo "--- Run CMake Configure -----------------------------------------------------------------------------" && - sh: cmake --version && - sh: cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - sh: echo "--- Build using CMake -------------------------------------------------------------------------------" && - - sh: cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + - sh: cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) From 9c97b820883180974bf9f5c2287f11766d351ebc Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sat, 16 Apr 2022 23:51:05 +0200 Subject: [PATCH 09/12] tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script --- appveyor.yml | 122 +++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 67 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e4b4082fda..a85034301f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ build: #configurations to build configuration: - - release + - Release # - debug @@ -25,36 +25,42 @@ environment: USE_CMAKE: true matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + - image: Visual Studio 2015 QTABI: mingw53_32 + COMPILER: MinGW MINGWDIR: C:\Qt\Tools\mingw530_32 QTVER: 5.11 MAKETOOL: mingw32-make CMAKE_GENERATOR: "MinGW Makefiles" - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + - image: Visual Studio 2015 QTABI: msvc2015_64 + COMPILER: MSVC QTVER: 5.11 CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + - image: Visual Studio 2015 QTABI: msvc2015 + COMPILER: MSVC QTVER: 5.11 CMAKE_GENERATOR: "Visual Studio 15 2017" - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + - image: Visual Studio 2022 QTABI: msvc2019_64 + COMPILER: MSVC QTVER: 5.15 CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + - image: Visual Studio 2022 QTABI: mingw81_64 + COMPILER: MinGW MINGWDIR: C:\Qt\Tools\mingw810_64 QTVER: 5.15 CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + - image: Ubuntu2004 QTABI: gcc_64 + COMPILER: gcc QTVER: 5.15 CMAKE_GENERATOR: "Unix Makefiles" @@ -62,11 +68,10 @@ environment: for: # Windows (MinGW 5.3 & MSVC2015) - - matrix: + - + matrix: only: - - image: Visual Studio 2019 - - clone_folder: c:\Build\JKQtPlotter + - image: Visual Studio 2019 init: - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== @@ -82,12 +87,12 @@ for: - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% - - cmd: if /i "%QTABI:~0:5%"=="mingw" set "PATH=%MINGWDIR%\bin;%PATH%" + - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" - cmd: if %QTABI%==msvc2015 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 # Rename sh.exe as sh.exe in PATH interferes with MinGW - - cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" + - cmd: if %COMPILER%==MinGW rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - cmd: echo QTDIR=%QTDIR% - cmd: echo JOMDIR=%JOMDIR% - cmd: echo PATH=%PATH% @@ -99,34 +104,28 @@ for: build_script: - cmd: echo == BUILD JKQtPlotter ============================================================================ - - cd c:\Build\JKQtPlotter - - mkdir build - - cd build - - if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=Release) else (set CMAKE_CONFIGURATION=Debug) - - if [%USE_CMAKE%]==[true] ( - echo "--- Run CMake Configure -----------------------------------------------------------------------------" && - cmake --version && - cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - echo "--- Build using CMake -------------------------------------------------------------------------------" && - cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - else ( - echo "--- Run QMake Configure -----------------------------------------------------------------------------" && - qmake.exe -v && - qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && - call %MAKETOOL% && - cd ..) + - cmd: mkdir build + - cmd: cd build + - cmd: if [%USE_CMAKE%]==[true] echo "--- Run CMake Configure -----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[true] cmake --version && + - cmd: if [%USE_CMAKE%]==[true] cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + - cmd: if [%USE_CMAKE%]==[true] echo "--- Build using CMake -------------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[true] cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + - cmd: if [%USE_CMAKE%]==[false] echo "--- Run QMake Configure -----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[false] qmake.exe -v && + - cmd: if [%USE_CMAKE%]==[false] qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && + - cmd: if [%USE_CMAKE%]==[false] echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[false] call %MAKETOOL% && + - cmd: cd .. # Windows (MinGW 8.1 & MSVC2019) - - matrix: + - + matrix: only: - image: Visual Studio 2022 - - clone_folder: c:\Build\JKQtPlotter - init: - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== @@ -142,11 +141,11 @@ for: - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% - - cmd: if /i "%QTABI:~0:5%"=="mingw" set "PATH=%MINGWDIR%\bin;%PATH%" + - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" - cmd: if %QTABI%==msvc2019 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" - cmd: if %QTABI%==msvc2019_64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" # Rename sh.exe as sh.exe in PATH interferes with MinGW - - cmd: if /i "%QTABI:~0:5%"=="mingw" rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" + - cmd: if %COMPILER%==MinGW rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - cmd: echo QTDIR=%QTDIR% - cmd: echo JOMDIR=%JOMDIR% - cmd: echo PATH=%PATH% @@ -156,39 +155,32 @@ for: - cmd: set OPENCV_DIR=C:\tools\opencv\build - cmd: echo OPENCV_DIR=%OPENCV_DIR% - build_script: - cmd: echo == BUILD JKQtPlotter ============================================================================ - - cd c:\Build\JKQtPlotter - - mkdir build - - cd build - - if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=Release) else (set CMAKE_CONFIGURATION=Debug) - - if [%USE_CMAKE%]==[true] ( - echo "--- Run CMake Configure -----------------------------------------------------------------------------" && - cmake --version && - cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - echo "--- Build using CMake -------------------------------------------------------------------------------" && - cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - else ( - echo "--- Run QMake Configure -----------------------------------------------------------------------------" && - qmake.exe -v && - qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && - call %MAKETOOL% && - cd ..) + - cmd: mkdir build + - cmd: cd build + - cmd: if [%USE_CMAKE%]==[true] echo "--- Run CMake Configure -----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[true] cmake --version && + - cmd: if [%USE_CMAKE%]==[true] cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + - cmd: if [%USE_CMAKE%]==[true] echo "--- Build using CMake -------------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[true] cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + - cmd: if [%USE_CMAKE%]==[false] echo "--- Run QMake Configure -----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[false] qmake.exe -v && + - cmd: if [%USE_CMAKE%]==[false] qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && + - cmd: if [%USE_CMAKE%]==[false] echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && + - cmd: if [%USE_CMAKE%]==[false] call %MAKETOOL% && + - cmd: cd .. # Linux (Ubuntu2004) - - matrix: + - + matrix: only: - image: Ubuntu2004 - - clone_folder: ~/JKQtPlotter - - + init: - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) @@ -202,23 +194,19 @@ for: - sh: set QTDIR=$HOME/Qt/%QTVER%/%QTABI%/bin - sh: sudo apt update -qq - sh: sudo apt install -y build-essential git qt5-qmake cmake ninja-build - - cmd: echo QTDIR=%QTDIR% - - cmd: echo PATH=%PATH% - - cmd: echo == INSTALL OPENCV =============================================================================== + - sh: echo QTDIR=%QTDIR% + - sh: echo PATH=%PATH% + - sh: echo == INSTALL OPENCV =============================================================================== # Install OpenCV - sh: sudo apt install -y opencv - sh: echo OPENCV_DIR=%OPENCV_DIR% - build_script: - sh: echo == BUILD JKQtPlotter ============================================================================ - - sh: cd ~/JKQtPlotter - sh: mkdir build - sh: cd build - - sh: if [[ $CONFIGURATION release ]]; then export CMAKE_CONFIGURATION=Release; fi - - sh: if [[ $CONFIGURATION debug ]]; then export CMAKE_CONFIGURATION=Debug; fi - sh: echo "--- Run CMake Configure -----------------------------------------------------------------------------" && - sh: cmake --version && - sh: cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - sh: echo "--- Build using CMake -------------------------------------------------------------------------------" && - - sh: cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + - sh: cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) From 5040ea71fe9e76c1c69252234812c8c9942aeec0 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sun, 17 Apr 2022 13:49:29 +0200 Subject: [PATCH 10/12] fixed appveyor.yml (syntax, added CImg ...) --- appveyor.yml | 139 +++++++++++++++------------------------------------ 1 file changed, 41 insertions(+), 98 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b27342c218..7cd5013ca1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,33 +21,22 @@ environment: global: JOMDIR: C:\Qt\Tools\QtCreator\bin VSVER: 0 - CMAKE_BUILDFLAGS: /verbosity:minimal /maxcpucount + CMAKE_BUILDFLAGS: USE_CMAKE: true matrix: - #- QTABI: mingw53_32 - # COMPILER: MinGW - # MINGWDIR: C:\Qt\Tools\mingw530_32 - # QTVER: 5.11 - # MAKETOOL: mingw32-make - # CMAKE_GENERATOR: "MinGW Makefiles" - - #- QTABI: msvc2015 - # COMPILER: MSVC - # QTVER: 5.11 - # CMAKE_GENERATOR: "Visual Studio 14 2015" - - QTABI: msvc2019_64 COMPILER: MSVC QTVER: 5.15 - CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + CMAKE_GENERATOR: "Visual Studio 16 2019" + CMAKE_BUILDFLAGS: /verbosity:minimal /maxcpucount - - QTABI: mingw81_64 - COMPILER: MinGW - MINGWDIR: C:\Qt\Tools\mingw810_64 - QTVER: 5.15 - CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - +# - QTABI: mingw81_64 +# COMPILER: MinGW +# MINGWDIR: C:\Qt\Tools\mingw810_64 +# QTVER: 5.15 +# CMAKE_GENERATOR: "MinGW Makefiles" +# - QTABI: gcc_64 COMPILER: GCC QTVER: 5.15 @@ -55,7 +44,6 @@ environment: image: # AppVeyor builds are ordered by the image list: - #- Visual Studio 2017 - Visual Studio 2019 - Ubuntu2004 @@ -68,12 +56,6 @@ matrix: QTABI: mingw53_32 - image: Visual Studio 2019 QTABI: msvc2015 - - image: Visual Studio 2017 - QTABI: gcc_64 - - image: Visual Studio 2017 - QTABI: msvc2019_64 - - image: Visual Studio 2017 - QTABI: mingw81_64 - image: Ubuntu2004 QTABI: mingw81_64 - image: Ubuntu2004 @@ -87,65 +69,11 @@ matrix: for: - # Windows (MinGW 5.3 & MSVC2015) - - - matrix: - only: - - image: Visual Studio 2019 - - init: - - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% - - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% - - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% - - cmd: echo QTABI=%QTABI% - - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% - - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% - - install: - # Init compiler environment - - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== - - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin - - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% - - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" - - cmd: if %QTABI%==msvc2015 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 - # Rename sh.exe as sh.exe in PATH interferes with MinGW - - cmd: if %COMPILER%==MinGW rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - - cmd: echo QTDIR=%QTDIR% - - cmd: echo JOMDIR=%JOMDIR% - - cmd: echo PATH=%PATH% - - cmd: echo == INSTALL OPENCV =============================================================================== - # Install OpenCV - - cmd: choco install OpenCV - - cmd: set OPENCV_DIR=C:\tools\opencv\build - - cmd: echo OPENCV_DIR=%OPENCV_DIR% - - build_script: - - cmd: echo == BUILD JKQtPlotter ============================================================================ - - cmd: mkdir build - - cmd: cd build - #- cmd: if %USE_CMAKE%==true echo --- Run CMake Configure ----------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==true cmake --version && - - cmd: if %USE_CMAKE%==true cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - #- cmd: if %USE_CMAKE%==true echo --- Build using CMake ------------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==true cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - #- cmd: if %USE_CMAKE%==false echo --- Run QMake Configure ----------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==false qmake.exe -v && - - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - #- cmd: if %USE_CMAKE%==false echo --- Build using MAKETOOL ---------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==false call %MAKETOOL% && - - cmd: cd .. - - - - # Windows (MinGW 8.1 & MSVC2019) - matrix: only: - - image: Visual Studio 2022 + - image: Visual Studio 2019 init: - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== @@ -169,26 +97,30 @@ for: - cmd: echo QTDIR=%QTDIR% - cmd: echo JOMDIR=%JOMDIR% - cmd: echo PATH=%PATH% - - cmd: echo == INSTALL OPENCV =============================================================================== # Install OpenCV + - cmd: echo == INSTALL OPENCV =============================================================================== - cmd: choco install OpenCV - cmd: set OPENCV_DIR=C:\tools\opencv\build - cmd: echo OPENCV_DIR=%OPENCV_DIR% + # Install CImg + - cmd: echo == INSTALL CIMG ================================================================================= + - cmd: mkdir C:\tools\cimg + - cmd: git clone --depth=1 https://github.com/dtschump/CImg.git C:\tools\cimg + - cmd: set CIMG_DIR=C:\tools\cimg + - cmd: echo CIMG_DIR=%CIMG_DIR% + - cmd: set CIMG_INCLUDE_DIR=C:\tools\cimg + - cmd: echo CIMG_INCLUDE_DIR=%CIMG_INCLUDE_DIR% build_script: - cmd: echo == BUILD JKQtPlotter ============================================================================ - cmd: mkdir build - cmd: cd build - #- cmd: if %USE_CMAKE%==true echo --- Run CMake Configure ----------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==true cmake --version && - - cmd: if %USE_CMAKE%==true cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - #- cmd: if %USE_CMAKE%==true echo --- Build using CMake ------------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==true cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - #- cmd: if %USE_CMAKE%==false echo --- Run QMake Configure ----------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==false qmake.exe -v && - - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - #- cmd: if %USE_CMAKE%==false echo --- Build using MAKETOOL ---------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==false call %MAKETOOL% && + - cmd: if %USE_CMAKE%==true cmake --version + - cmd: if %USE_CMAKE%==true cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. + - cmd: if %USE_CMAKE%==true cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% + - cmd: if %USE_CMAKE%==false qmake.exe -v + - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro + - cmd: if %USE_CMAKE%==false call %MAKETOOL% - cmd: cd .. @@ -211,21 +143,32 @@ for: install: # Init compiler environment - sh: echo == INIT COMPILER ENVIRONMENT ==================================================================== - - sh: set QTDIR=$HOME/Qt/$QTVER/$QTABI/bin + - sh: export QTDIR=$HOME/Qt/$QTVER/$QTABI/ + - sh: export Qt5_DIR=$QTDIR/lib/cmake - sh: sudo apt update -qq - - sh: sudo apt install -y build-essential git qt5-qmake cmake + - sh: sudo apt install -y build-essential git graphviz doxygen mesa-common-dev libglu1-mesa-dev qt5-qmake cmake - sh: echo QTDIR=$QTDIR + - sh: echo Qt5_DIR=$Qt5_DIR + - sh: ls /home/appveyor + - sh: ls /home/appveyor/Qt + - sh: ls /home/appveyor/Qt/5.15 + - sh: ls /home/appveyor/Qt/5.15/gcc_64 - sh: echo PATH=$PATH - - sh: echo == INSTALL OPENCV =============================================================================== + - sh: sudo apt-get update -y # Install OpenCV + - sh: echo == INSTALL OPENCV =============================================================================== - sh: sudo apt install -y libopencv-dev + # Install CImg + - sh: echo == INSTALL CImg ================================================================================= + - sh: sudo apt install -y cimg-dev build_script: - sh: echo == BUILD JKQtPlotter ============================================================================ - sh: mkdir build - sh: cd build - sh: echo --- Run CMake Configure ----------------------------------------------------------------------------- + - sh: doxygen --version - sh: cmake --version - - sh: cmake -G "$CMAKE_GENERATOR" .. + - sh: cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR" .. - sh: echo --- Build using CMake ------------------------------------------------------------------------------- - - sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS ) + - sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS From 75beb063df8de856856393bd7f4549da67778afc Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Fri, 15 Apr 2022 20:41:56 +0200 Subject: [PATCH 11/12] modernized appveyor.yml --- appveyor.yml | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 355 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 7cd5013ca1..e3ba6f5f6d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,69 @@ +<<<<<<< HEAD +<<<<<<< HEAD version: 0.{build}-{branch} +<<<<<<< HEAD # don't build tags +======= + +environment: + global: + JOMDIR: C:\Qt\Tools\QtCreator\bin + MINGWDIR: C:\Qt\Tools\mingw530_32 + VSVER: 0 + USE_LINUX: false + + matrix: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QTABI: mingw53_32 + QTVER: 5.11 + ARCH: x86 + MAKETOOL: mingw32-make + CMAKE_GENERATOR: "MinGW Makefiles" + USE_CMAKE: true + MSBUILD_FLAGS: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QTABI: msvc2017_64 + QTVER: 5.11 + ARCH: x64 + VSVER: 2017 + CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" + USE_CMAKE: true + MSBUILD_FLAGS: /verbosity:minimal /maxcpucount + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + QTABI: msvc2019_64 + QTVER: 5.15.2 + ARCH: x64 + VSVER: 2019 + CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + USE_CMAKE: true + MSBUILD_FLAGS: /verbosity:minimal /maxcpucount + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + QTABI: msvc2015 + QTVER: 5.11 + ARCH: x86 + VSVER: 14 + CMAKE_GENERATOR: "Visual Studio 15 2017" + USE_CMAKE: true + MSBUILD_FLAGS: /verbosity:minimal /maxcpucount + # - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + # QTABI: gcc_64 + # QTVER: 5.15.2 + # ARCH: x64 + # CMAKE_GENERATOR: "Unix Makefiles" + # USE_CMAKE: true + # USE_LINUX: true + + +>>>>>>> fa0e58e (added build for higher Qt version to appveyor.yml) +======= +version: {branch}-0.{build} +======= +version: 0.{build}-{branch} +>>>>>>> 1bbbe35 (corrected appveyor.yml: Unix-Build (calculating Qt path)) + +# don't build tags +>>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) skip_tags: true @@ -16,11 +79,16 @@ configuration: # - debug +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) # define build matrix environment: global: JOMDIR: C:\Qt\Tools\QtCreator\bin VSVER: 0 +<<<<<<< HEAD CMAKE_BUILDFLAGS: USE_CMAKE: true @@ -46,6 +114,26 @@ image: # AppVeyor builds are ordered by the image list: - Visual Studio 2019 - Ubuntu2004 +======= +install: + - IF %VSVER% GTR 14 ( + call "C:\Program Files (x86)\Microsoft Visual Studio\%VSVER%\Community\VC\Auxiliary\Build\vcvarsall.bat" %ARCH% + ) ELSE ( + IF %VSVER% GTR 0 ( + call "C:\Program Files (x86)\Microsoft Visual Studio "%VSVER%".0\VC\vcvarsall.bat" %ARCH% + ) ELSE ( + set "PATH=%MINGWDIR%\bin;%PATH%" + ) + ) + - set PATH=C:\Qt\%QTVER%\%QTABI%\bin;%JOMDIR%;%PATH% + - echo "PATH = %PATH%" + - echo "APPVEYOR_BUILD_WORKER_IMAGE = %APPVEYOR_BUILD_WORKER_IMAGE%" + - echo "BUILD ID Qt%QTVER%_%QTABI%_%APPVEYOR_BUILD_VERSION%_%CONFIGURATION%" + # Rename sh.exe as sh.exe in PATH interferes with MinGW + - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" + - cmd: choco install OpenCV + - cmd: set OPENCV_DIR=C:\tools\opencv\build +>>>>>>> 29101b6 (added debug output to appveyor.yml) matrix: exclude: @@ -75,11 +163,92 @@ for: only: - image: Visual Studio 2019 +======= + CMAKE_BUILDFLAGS: /verbosity:minimal /maxcpucount + USE_CMAKE: true + + matrix: + #- QTABI: mingw53_32 + # COMPILER: MinGW + # MINGWDIR: C:\Qt\Tools\mingw530_32 + # QTVER: 5.11 + # MAKETOOL: mingw32-make + # CMAKE_GENERATOR: "MinGW Makefiles" + + #- QTABI: msvc2015 + # COMPILER: MSVC + # QTVER: 5.11 + # CMAKE_GENERATOR: "Visual Studio 14 2015" + + - QTABI: msvc2019_64 + COMPILER: MSVC + QTVER: 5.15 + CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + + - QTABI: mingw81_64 + COMPILER: MinGW + MINGWDIR: C:\Qt\Tools\mingw810_64 + QTVER: 5.15 + CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" + + - QTABI: gcc_64 + COMPILER: GCC + QTVER: 5.15 + CMAKE_GENERATOR: "Unix Makefiles" + +image: + # AppVeyor builds are ordered by the image list: + #- Visual Studio 2017 + - Visual Studio 2019 + - Ubuntu2004 + +matrix: + exclude: + # Exclude invalid options + - image: Visual Studio 2019 + QTABI: gcc_64 + - image: Visual Studio 2019 + QTABI: mingw53_32 + - image: Visual Studio 2019 + QTABI: msvc2015 + - image: Visual Studio 2017 + QTABI: gcc_64 + - image: Visual Studio 2017 + QTABI: msvc2019_64 + - image: Visual Studio 2017 + QTABI: mingw81_64 + - image: Ubuntu2004 + QTABI: mingw81_64 + - image: Ubuntu2004 + QTABI: msvc2019_64 + - image: Ubuntu2004 + QTABI: msvc2015_64 + - image: Ubuntu2004 + QTABI: msvc2015 + - image: Ubuntu2004 + QTABI: mingw53_32 + + +for: + # Windows (MinGW 5.3 & MSVC2015) + - + matrix: + only: + - image: Visual Studio 2019 + +>>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) init: - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% +<<<<<<< HEAD +<<<<<<< HEAD +======= + - cmd: echo ARCH=%ARCH% +>>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) +======= +>>>>>>> 1bbbe35 (corrected appveyor.yml: Unix-Build (calculating Qt path)) - cmd: echo QTABI=%QTABI% - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% @@ -89,6 +258,9 @@ for: - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" - cmd: if %QTABI%==msvc2019 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" - cmd: if %QTABI%==msvc2019_64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" @@ -122,6 +294,138 @@ for: - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro - cmd: if %USE_CMAKE%==false call %MAKETOOL% - cmd: cd .. +======= + - cmd: if /i "%QTABI:~0:5%"=="mingw" set "PATH=%MINGWDIR%\bin;%PATH%" +======= + - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" +>>>>>>> 9c97b82 (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) +======= + - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" +>>>>>>> 22ac8fc (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) + - cmd: if %QTABI%==msvc2015 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 + - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 + - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 + # Rename sh.exe as sh.exe in PATH interferes with MinGW + - cmd: if %COMPILER%==MinGW rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" + - cmd: echo QTDIR=%QTDIR% + - cmd: echo JOMDIR=%JOMDIR% + - cmd: echo PATH=%PATH% + - cmd: echo == INSTALL OPENCV =============================================================================== + # Install OpenCV + - cmd: choco install OpenCV + - cmd: set OPENCV_DIR=C:\tools\opencv\build + - cmd: echo OPENCV_DIR=%OPENCV_DIR% + + build_script: + - cmd: echo == BUILD JKQtPlotter ============================================================================ +<<<<<<< HEAD +<<<<<<< HEAD + - cd c:\Build\JKQtPlotter + - mkdir build + - cd build + - if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=Release) else (set CMAKE_CONFIGURATION=Debug) + - if [%USE_CMAKE%]==[true] ( + echo "--- Run CMake Configure -----------------------------------------------------------------------------" && + cmake --version && + cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + echo "--- Build using CMake -------------------------------------------------------------------------------" && + cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + else ( + echo "--- Run QMake Configure -----------------------------------------------------------------------------" && + qmake.exe -v && + qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && + echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && + call %MAKETOOL% && + cd ..) +>>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) +======= +======= +>>>>>>> 22ac8fc (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) + - cmd: mkdir build + - cmd: cd build + #- cmd: if %USE_CMAKE%==true echo --- Run CMake Configure ----------------------------------------------------------------------------- && + - cmd: if %USE_CMAKE%==true cmake --version && + - cmd: if %USE_CMAKE%==true cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + #- cmd: if %USE_CMAKE%==true echo --- Build using CMake ------------------------------------------------------------------------------- && + - cmd: if %USE_CMAKE%==true cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + #- cmd: if %USE_CMAKE%==false echo --- Run QMake Configure ----------------------------------------------------------------------------- && + - cmd: if %USE_CMAKE%==false qmake.exe -v && + - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && + #- cmd: if %USE_CMAKE%==false echo --- Build using MAKETOOL ---------------------------------------------------------------------------- && + - cmd: if %USE_CMAKE%==false call %MAKETOOL% && + - cmd: cd .. +<<<<<<< HEAD +>>>>>>> 9c97b82 (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) +======= +>>>>>>> 22ac8fc (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) + + + + +<<<<<<< HEAD + + # Linux (Ubuntu2004) + - + matrix: + only: + - image: Ubuntu2004 + + init: + - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== + - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) + - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=$APPVEYOR_BUILD_WORKER_IMAGE + - sh: echo QTABI=$QTABI + - sh: echo CMAKE_GENERATOR=$CMAKE_GENERATOR +======= + # Windows (MinGW 8.1 & MSVC2019) + - + matrix: + only: + - image: Visual Studio 2022 + + init: + - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== + - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% + - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% + - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% + - cmd: echo QTABI=%QTABI% + - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% + - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% + + install: + # Init compiler environment + - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== + - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin + - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% + - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" + - cmd: if %QTABI%==msvc2019 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" + - cmd: if %QTABI%==msvc2019_64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" + # Rename sh.exe as sh.exe in PATH interferes with MinGW + - cmd: if %COMPILER%==MinGW rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" + - cmd: echo QTDIR=%QTDIR% + - cmd: echo JOMDIR=%JOMDIR% + - cmd: echo PATH=%PATH% + - cmd: echo == INSTALL OPENCV =============================================================================== + # Install OpenCV + - cmd: choco install OpenCV + - cmd: set OPENCV_DIR=C:\tools\opencv\build + - cmd: echo OPENCV_DIR=%OPENCV_DIR% + + build_script: + - cmd: echo == BUILD JKQtPlotter ============================================================================ + - cmd: mkdir build + - cmd: cd build + #- cmd: if %USE_CMAKE%==true echo --- Run CMake Configure ----------------------------------------------------------------------------- && + - cmd: if %USE_CMAKE%==true cmake --version && + - cmd: if %USE_CMAKE%==true cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + #- cmd: if %USE_CMAKE%==true echo --- Build using CMake ------------------------------------------------------------------------------- && + - cmd: if %USE_CMAKE%==true cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) + #- cmd: if %USE_CMAKE%==false echo --- Run QMake Configure ----------------------------------------------------------------------------- && + - cmd: if %USE_CMAKE%==false qmake.exe -v && + - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && + #- cmd: if %USE_CMAKE%==false echo --- Build using MAKETOOL ---------------------------------------------------------------------------- && + - cmd: if %USE_CMAKE%==false call %MAKETOOL% && + - cmd: cd .. @@ -136,13 +440,23 @@ for: init: - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) +<<<<<<< HEAD + - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% + - sh: echo QTABI=%QTABI% + - sh: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% +>>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) +======= - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=$APPVEYOR_BUILD_WORKER_IMAGE - sh: echo QTABI=$QTABI - sh: echo CMAKE_GENERATOR=$CMAKE_GENERATOR +>>>>>>> f17c29e (Merge branch 'master' of https://github.com/jkriege2/JKQtPlotter) install: # Init compiler environment - sh: echo == INIT COMPILER ENVIRONMENT ==================================================================== +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD - sh: export QTDIR=$HOME/Qt/$QTVER/$QTABI/ - sh: export Qt5_DIR=$QTDIR/lib/cmake - sh: sudo apt update -qq @@ -172,3 +486,44 @@ for: - sh: cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR" .. - sh: echo --- Build using CMake ------------------------------------------------------------------------------- - sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS +======= +======= + - sh: set QTDIR=$HOME/Qt/%QTVER%/%QTABI%/bin +>>>>>>> 1bbbe35 (corrected appveyor.yml: Unix-Build (calculating Qt path)) +======= + - sh: set QTDIR=$HOME/Qt/$QTVER/$QTABI/bin +>>>>>>> f17c29e (Merge branch 'master' of https://github.com/jkriege2/JKQtPlotter) + - sh: sudo apt update -qq + - sh: sudo apt install -y build-essential git qt5-qmake cmake + - sh: echo QTDIR=$QTDIR + - sh: echo PATH=$PATH + - sh: echo == INSTALL OPENCV =============================================================================== + # Install OpenCV + - sh: sudo apt install -y libopencv-dev + + build_script: + - sh: echo == BUILD JKQtPlotter ============================================================================ + - sh: mkdir build + - sh: cd build +<<<<<<< HEAD + - sh: echo "--- Run CMake Configure -----------------------------------------------------------------------------" && + - sh: cmake --version && + - sh: cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && + - sh: echo "--- Build using CMake -------------------------------------------------------------------------------" && +<<<<<<< HEAD +<<<<<<< HEAD + - sh: cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) +>>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) +======= + - sh: cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) +>>>>>>> 9c97b82 (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) +======= + - sh: cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) +>>>>>>> 22ac8fc (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) +======= + - sh: echo --- Run CMake Configure ----------------------------------------------------------------------------- + - sh: cmake --version + - sh: cmake -G "$CMAKE_GENERATOR" .. + - sh: echo --- Build using CMake ------------------------------------------------------------------------------- + - sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS ) +>>>>>>> f17c29e (Merge branch 'master' of https://github.com/jkriege2/JKQtPlotter) From 770c839d13607b2446dcc091c4fdc26aaf0bb0aa Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sun, 17 Apr 2022 23:18:14 +0200 Subject: [PATCH 12/12] moderized appveyor.yml --- appveyor.yml | 355 --------------------------------------------------- 1 file changed, 355 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e3ba6f5f6d..7cd5013ca1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,69 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD version: 0.{build}-{branch} -<<<<<<< HEAD # don't build tags -======= - -environment: - global: - JOMDIR: C:\Qt\Tools\QtCreator\bin - MINGWDIR: C:\Qt\Tools\mingw530_32 - VSVER: 0 - USE_LINUX: false - - matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - QTABI: mingw53_32 - QTVER: 5.11 - ARCH: x86 - MAKETOOL: mingw32-make - CMAKE_GENERATOR: "MinGW Makefiles" - USE_CMAKE: true - MSBUILD_FLAGS: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - QTABI: msvc2017_64 - QTVER: 5.11 - ARCH: x64 - VSVER: 2017 - CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" - USE_CMAKE: true - MSBUILD_FLAGS: /verbosity:minimal /maxcpucount - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - QTABI: msvc2019_64 - QTVER: 5.15.2 - ARCH: x64 - VSVER: 2019 - CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - USE_CMAKE: true - MSBUILD_FLAGS: /verbosity:minimal /maxcpucount - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - QTABI: msvc2015 - QTVER: 5.11 - ARCH: x86 - VSVER: 14 - CMAKE_GENERATOR: "Visual Studio 15 2017" - USE_CMAKE: true - MSBUILD_FLAGS: /verbosity:minimal /maxcpucount - # - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - # QTABI: gcc_64 - # QTVER: 5.15.2 - # ARCH: x64 - # CMAKE_GENERATOR: "Unix Makefiles" - # USE_CMAKE: true - # USE_LINUX: true - - ->>>>>>> fa0e58e (added build for higher Qt version to appveyor.yml) -======= -version: {branch}-0.{build} -======= -version: 0.{build}-{branch} ->>>>>>> 1bbbe35 (corrected appveyor.yml: Unix-Build (calculating Qt path)) - -# don't build tags ->>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) skip_tags: true @@ -79,16 +16,11 @@ configuration: # - debug -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) # define build matrix environment: global: JOMDIR: C:\Qt\Tools\QtCreator\bin VSVER: 0 -<<<<<<< HEAD CMAKE_BUILDFLAGS: USE_CMAKE: true @@ -114,26 +46,6 @@ image: # AppVeyor builds are ordered by the image list: - Visual Studio 2019 - Ubuntu2004 -======= -install: - - IF %VSVER% GTR 14 ( - call "C:\Program Files (x86)\Microsoft Visual Studio\%VSVER%\Community\VC\Auxiliary\Build\vcvarsall.bat" %ARCH% - ) ELSE ( - IF %VSVER% GTR 0 ( - call "C:\Program Files (x86)\Microsoft Visual Studio "%VSVER%".0\VC\vcvarsall.bat" %ARCH% - ) ELSE ( - set "PATH=%MINGWDIR%\bin;%PATH%" - ) - ) - - set PATH=C:\Qt\%QTVER%\%QTABI%\bin;%JOMDIR%;%PATH% - - echo "PATH = %PATH%" - - echo "APPVEYOR_BUILD_WORKER_IMAGE = %APPVEYOR_BUILD_WORKER_IMAGE%" - - echo "BUILD ID Qt%QTVER%_%QTABI%_%APPVEYOR_BUILD_VERSION%_%CONFIGURATION%" - # Rename sh.exe as sh.exe in PATH interferes with MinGW - - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - - cmd: choco install OpenCV - - cmd: set OPENCV_DIR=C:\tools\opencv\build ->>>>>>> 29101b6 (added debug output to appveyor.yml) matrix: exclude: @@ -163,92 +75,11 @@ for: only: - image: Visual Studio 2019 -======= - CMAKE_BUILDFLAGS: /verbosity:minimal /maxcpucount - USE_CMAKE: true - - matrix: - #- QTABI: mingw53_32 - # COMPILER: MinGW - # MINGWDIR: C:\Qt\Tools\mingw530_32 - # QTVER: 5.11 - # MAKETOOL: mingw32-make - # CMAKE_GENERATOR: "MinGW Makefiles" - - #- QTABI: msvc2015 - # COMPILER: MSVC - # QTVER: 5.11 - # CMAKE_GENERATOR: "Visual Studio 14 2015" - - - QTABI: msvc2019_64 - COMPILER: MSVC - QTVER: 5.15 - CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - - - QTABI: mingw81_64 - COMPILER: MinGW - MINGWDIR: C:\Qt\Tools\mingw810_64 - QTVER: 5.15 - CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" - - - QTABI: gcc_64 - COMPILER: GCC - QTVER: 5.15 - CMAKE_GENERATOR: "Unix Makefiles" - -image: - # AppVeyor builds are ordered by the image list: - #- Visual Studio 2017 - - Visual Studio 2019 - - Ubuntu2004 - -matrix: - exclude: - # Exclude invalid options - - image: Visual Studio 2019 - QTABI: gcc_64 - - image: Visual Studio 2019 - QTABI: mingw53_32 - - image: Visual Studio 2019 - QTABI: msvc2015 - - image: Visual Studio 2017 - QTABI: gcc_64 - - image: Visual Studio 2017 - QTABI: msvc2019_64 - - image: Visual Studio 2017 - QTABI: mingw81_64 - - image: Ubuntu2004 - QTABI: mingw81_64 - - image: Ubuntu2004 - QTABI: msvc2019_64 - - image: Ubuntu2004 - QTABI: msvc2015_64 - - image: Ubuntu2004 - QTABI: msvc2015 - - image: Ubuntu2004 - QTABI: mingw53_32 - - -for: - # Windows (MinGW 5.3 & MSVC2015) - - - matrix: - only: - - image: Visual Studio 2019 - ->>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) init: - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% -<<<<<<< HEAD -<<<<<<< HEAD -======= - - cmd: echo ARCH=%ARCH% ->>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) -======= ->>>>>>> 1bbbe35 (corrected appveyor.yml: Unix-Build (calculating Qt path)) - cmd: echo QTABI=%QTABI% - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% @@ -258,9 +89,6 @@ for: - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" - cmd: if %QTABI%==msvc2019 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" - cmd: if %QTABI%==msvc2019_64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" @@ -294,138 +122,6 @@ for: - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro - cmd: if %USE_CMAKE%==false call %MAKETOOL% - cmd: cd .. -======= - - cmd: if /i "%QTABI:~0:5%"=="mingw" set "PATH=%MINGWDIR%\bin;%PATH%" -======= - - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" ->>>>>>> 9c97b82 (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) -======= - - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" ->>>>>>> 22ac8fc (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) - - cmd: if %QTABI%==msvc2015 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - - cmd: if %QTABI%==msvc2015_64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 - # Rename sh.exe as sh.exe in PATH interferes with MinGW - - cmd: if %COMPILER%==MinGW rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - - cmd: echo QTDIR=%QTDIR% - - cmd: echo JOMDIR=%JOMDIR% - - cmd: echo PATH=%PATH% - - cmd: echo == INSTALL OPENCV =============================================================================== - # Install OpenCV - - cmd: choco install OpenCV - - cmd: set OPENCV_DIR=C:\tools\opencv\build - - cmd: echo OPENCV_DIR=%OPENCV_DIR% - - build_script: - - cmd: echo == BUILD JKQtPlotter ============================================================================ -<<<<<<< HEAD -<<<<<<< HEAD - - cd c:\Build\JKQtPlotter - - mkdir build - - cd build - - if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=Release) else (set CMAKE_CONFIGURATION=Debug) - - if [%USE_CMAKE%]==[true] ( - echo "--- Run CMake Configure -----------------------------------------------------------------------------" && - cmake --version && - cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - echo "--- Build using CMake -------------------------------------------------------------------------------" && - cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - else ( - echo "--- Run QMake Configure -----------------------------------------------------------------------------" && - qmake.exe -v && - qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && - call %MAKETOOL% && - cd ..) ->>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) -======= -======= ->>>>>>> 22ac8fc (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) - - cmd: mkdir build - - cmd: cd build - #- cmd: if %USE_CMAKE%==true echo --- Run CMake Configure ----------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==true cmake --version && - - cmd: if %USE_CMAKE%==true cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - #- cmd: if %USE_CMAKE%==true echo --- Build using CMake ------------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==true cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - #- cmd: if %USE_CMAKE%==false echo --- Run QMake Configure ----------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==false qmake.exe -v && - - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - #- cmd: if %USE_CMAKE%==false echo --- Build using MAKETOOL ---------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==false call %MAKETOOL% && - - cmd: cd .. -<<<<<<< HEAD ->>>>>>> 9c97b82 (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) -======= ->>>>>>> 22ac8fc (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) - - - - -<<<<<<< HEAD - - # Linux (Ubuntu2004) - - - matrix: - only: - - image: Ubuntu2004 - - init: - - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) - - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=$APPVEYOR_BUILD_WORKER_IMAGE - - sh: echo QTABI=$QTABI - - sh: echo CMAKE_GENERATOR=$CMAKE_GENERATOR -======= - # Windows (MinGW 8.1 & MSVC2019) - - - matrix: - only: - - image: Visual Studio 2022 - - init: - - cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - - cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% - - cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER% - - cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% - - cmd: echo QTABI=%QTABI% - - cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% - - cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS% - - install: - # Init compiler environment - - cmd: echo == INIT COMPILER ENVIRONMENT ==================================================================== - - cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin - - cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH% - - cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%" - - cmd: if %QTABI%==msvc2019 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" - - cmd: if %QTABI%==msvc2019_64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - # Rename sh.exe as sh.exe in PATH interferes with MinGW - - cmd: if %COMPILER%==MinGW rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe" - - cmd: echo QTDIR=%QTDIR% - - cmd: echo JOMDIR=%JOMDIR% - - cmd: echo PATH=%PATH% - - cmd: echo == INSTALL OPENCV =============================================================================== - # Install OpenCV - - cmd: choco install OpenCV - - cmd: set OPENCV_DIR=C:\tools\opencv\build - - cmd: echo OPENCV_DIR=%OPENCV_DIR% - - build_script: - - cmd: echo == BUILD JKQtPlotter ============================================================================ - - cmd: mkdir build - - cmd: cd build - #- cmd: if %USE_CMAKE%==true echo --- Run CMake Configure ----------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==true cmake --version && - - cmd: if %USE_CMAKE%==true cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - #- cmd: if %USE_CMAKE%==true echo --- Build using CMake ------------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==true cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - #- cmd: if %USE_CMAKE%==false echo --- Run QMake Configure ----------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==false qmake.exe -v && - - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - #- cmd: if %USE_CMAKE%==false echo --- Build using MAKETOOL ---------------------------------------------------------------------------- && - - cmd: if %USE_CMAKE%==false call %MAKETOOL% && - - cmd: cd .. @@ -440,23 +136,13 @@ for: init: - sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) -<<<<<<< HEAD - - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% - - sh: echo QTABI=%QTABI% - - sh: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% ->>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) -======= - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=$APPVEYOR_BUILD_WORKER_IMAGE - sh: echo QTABI=$QTABI - sh: echo CMAKE_GENERATOR=$CMAKE_GENERATOR ->>>>>>> f17c29e (Merge branch 'master' of https://github.com/jkriege2/JKQtPlotter) install: # Init compiler environment - sh: echo == INIT COMPILER ENVIRONMENT ==================================================================== -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - sh: export QTDIR=$HOME/Qt/$QTVER/$QTABI/ - sh: export Qt5_DIR=$QTDIR/lib/cmake - sh: sudo apt update -qq @@ -486,44 +172,3 @@ for: - sh: cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR" .. - sh: echo --- Build using CMake ------------------------------------------------------------------------------- - sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS -======= -======= - - sh: set QTDIR=$HOME/Qt/%QTVER%/%QTABI%/bin ->>>>>>> 1bbbe35 (corrected appveyor.yml: Unix-Build (calculating Qt path)) -======= - - sh: set QTDIR=$HOME/Qt/$QTVER/$QTABI/bin ->>>>>>> f17c29e (Merge branch 'master' of https://github.com/jkriege2/JKQtPlotter) - - sh: sudo apt update -qq - - sh: sudo apt install -y build-essential git qt5-qmake cmake - - sh: echo QTDIR=$QTDIR - - sh: echo PATH=$PATH - - sh: echo == INSTALL OPENCV =============================================================================== - # Install OpenCV - - sh: sudo apt install -y libopencv-dev - - build_script: - - sh: echo == BUILD JKQtPlotter ============================================================================ - - sh: mkdir build - - sh: cd build -<<<<<<< HEAD - - sh: echo "--- Run CMake Configure -----------------------------------------------------------------------------" && - - sh: cmake --version && - - sh: cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - - sh: echo "--- Build using CMake -------------------------------------------------------------------------------" && -<<<<<<< HEAD -<<<<<<< HEAD - - sh: cmake --build . --config "%CMAKE_CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) ->>>>>>> 24f7646 (update appveyor.yml, added Qt 5.15 & Unix) -======= - - sh: cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) ->>>>>>> 9c97b82 (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) -======= - - sh: cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) ->>>>>>> 22ac8fc (tried to fix problem in appveyor.yml: build-phase set to MSBuild, but should be script) -======= - - sh: echo --- Run CMake Configure ----------------------------------------------------------------------------- - - sh: cmake --version - - sh: cmake -G "$CMAKE_GENERATOR" .. - - sh: echo --- Build using CMake ------------------------------------------------------------------------------- - - sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS ) ->>>>>>> f17c29e (Merge branch 'master' of https://github.com/jkriege2/JKQtPlotter)