From 86ba47db9a1ff32ab2e0a8a2116f840925f01e9b Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sat, 11 May 2019 16:09:44 +0200 Subject: [PATCH] some bugfixes in build scripts/QMake projects --- JKQtPlotterBuildAllExamples.pro | 2 +- .../jkqtplotter_simpletest_imageplot_nodatastore.pro | 12 +++++++++++- .../test_distributionplot/test_distributionplot.pro | 12 ++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/JKQtPlotterBuildAllExamples.pro b/JKQtPlotterBuildAllExamples.pro index e19977d62a..904166e366 100644 --- a/JKQtPlotterBuildAllExamples.pro +++ b/JKQtPlotterBuildAllExamples.pro @@ -76,7 +76,7 @@ addSimpleTest(geometric) addSimpleTest(ui) addSimpleTest(boxplot) addSimpleTest(advancedlineandfillstyling) -#addSimpleTest(imageplot_nodatastore) +addSimpleTest(imageplot_nodatastore) #addSimpleTest(rgbimageplot_opencv) #addSimpleTest(imageplot_opencv) diff --git a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro b/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro index 7dea1893b6..4ccaa54d22 100644 --- a/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro +++ b/examples/simpletest_imageplot_nodatastore/jkqtplotter_simpletest_imageplot_nodatastore.pro @@ -21,7 +21,17 @@ CONFIG (debug, debug|release) { } message("LIBS = $$LIBS") - +!win32-msvc* { + QMAKE_CXXFLAGS += -fexceptions +} else { + QMAKE_CXXFLAGS += /EHsc + # /std:c++14 + # To enable M_PI, M_E,... + DEFINES += _USE_MATH_DEFINES + # To fix error: C2338: va_start argument must not + # have reference type and must not be parenthesized + DEFINES += _CRT_NO_VA_START_VALIDATION +} diff --git a/examples/test_distributionplot/test_distributionplot.pro b/examples/test_distributionplot/test_distributionplot.pro index b0746fa89e..bbf3fa6857 100644 --- a/examples/test_distributionplot/test_distributionplot.pro +++ b/examples/test_distributionplot/test_distributionplot.pro @@ -1,6 +1,18 @@ # source code for this simple demo SOURCES = test_distributionplot.cpp +!win32-msvc* { + QMAKE_CXXFLAGS += -fexceptions +} else { + QMAKE_CXXFLAGS += /EHsc + # /std:c++14 + # To enable M_PI, M_E,... + DEFINES += _USE_MATH_DEFINES + # To fix error: C2338: va_start argument must not + # have reference type and must not be parenthesized + DEFINES += _CRT_NO_VA_START_VALIDATION +} + # configure Qt CONFIG += link_prl qt QT += core gui xml svg