From fc7622e901cec7ed68abe6b2d95ea20ce30490ed Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Mon, 19 Oct 2020 16:05:18 +0200 Subject: [PATCH] several minor bugfixes to QMake build system --- JKQtPlotterBuildAllExamples.pro | 5 ++++- .../jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro | 8 ++++---- examples/jkqtplot_test/jkqtpemfengineadapter.h | 2 +- examples/mandelbrot/mandelbrot.pro | 9 ++++++++- lib/jkqtplotter/CMakeLists.txt | 2 ++ 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/JKQtPlotterBuildAllExamples.pro b/JKQtPlotterBuildAllExamples.pro index b293c056e2..b32d5a79a2 100644 --- a/JKQtPlotterBuildAllExamples.pro +++ b/JKQtPlotterBuildAllExamples.pro @@ -33,9 +33,12 @@ jkqtmathtext_simpletest.depends = jkqtmathtextlib jkqtmathtext_test.subdir = examples/jkqtmathtext_test jkqtmathtext_test.depends = jkqtplotterlib -jkqtplotter_simpletest.file = examples/simpletest/jkqtplotter_simpletest.pro +jkqtplotter_simpletest.file = examples/simpletest/simpletest.pro jkqtplotter_simpletest.depends = jkqtplotterlib +jkqtplot_test.file = examples/jkqtplot_test/jkqtplot_test.pro +jkqtplot_test.depends = jkqtplotterlib + jkqtfastplotter_test.file = $$PWD/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro jkqtfastplotter_test.depends = jkqtfastplotterlib diff --git a/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro b/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro index 36616d0ab3..fe130a232a 100644 --- a/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro +++ b/examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro @@ -8,12 +8,12 @@ QT += core gui xml svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport -DEPENDPATH += ../../../lib ../../../qmake/staticlib/jkqtplotterlib -INCLUDEPATH += ../../../lib +DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib +INCLUDEPATH += ../../lib CONFIG (debug, debug|release) { - LIBS += -L../../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug + LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug } else { - LIBS += -L../../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib + LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib } message("LIBS = $$LIBS") diff --git a/examples/jkqtplot_test/jkqtpemfengineadapter.h b/examples/jkqtplot_test/jkqtpemfengineadapter.h index a716b808ba..17e489ebec 100644 --- a/examples/jkqtplot_test/jkqtpemfengineadapter.h +++ b/examples/jkqtplot_test/jkqtpemfengineadapter.h @@ -4,7 +4,7 @@ #include "EmfEngine/src/EmfEngine.h" #include #include -#include "../../../jkqtpbaseplotter.h" +#include "../../lib/jkqtplotter/jkqtpbaseplotter.h" class JKQTPEmfEngineAdapter : public JKQTPPaintDeviceAdapter { diff --git a/examples/mandelbrot/mandelbrot.pro b/examples/mandelbrot/mandelbrot.pro index 3a0a5c6054..ef220a069c 100644 --- a/examples/mandelbrot/mandelbrot.pro +++ b/examples/mandelbrot/mandelbrot.pro @@ -1,5 +1,12 @@ # source code for this simple demo -SOURCES = mandelbrot.cpp +SOURCES = mandelbrot.cpp \ + mandelbrotmainwindow.cpp + +HEADERS = mandelbrotmainwindow.h + +FORMS = mandelbrotmainwindow.ui + + # configure Qt CONFIG += link_prl qt diff --git a/lib/jkqtplotter/CMakeLists.txt b/lib/jkqtplotter/CMakeLists.txt index b81e727232..d4ffc1676b 100644 --- a/lib/jkqtplotter/CMakeLists.txt +++ b/lib/jkqtplotter/CMakeLists.txt @@ -255,3 +255,5 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${lib_name}_Readme.txt" DESTINATION d install(FILES "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION doc/JKQtPlotter RENAME "${lib_name}_LICENSE.txt" ) +#get_target_property(printsupp_inc Qt5::PrintSupport INTERFACE_INCLUDE_DIRECTORIES) +#message("Qt5::PrintSupport::INTERFACE_INCLUDE_DIRECTORIES = ${printsupp_inc}")