From d79584247727701c55d09bf1d17d22f9e9be0481 Mon Sep 17 00:00:00 2001 From: "Jan W. Krieger" Date: Fri, 28 Dec 2018 13:54:17 +0100 Subject: [PATCH] more build bugfixes --- JKQtFastPlotterBuildAllExamples.pro | 6 ++---- lib/jkqtfastplotterlib.pro | 2 +- .../jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro | 8 ++++++++ test/jkqtplot_test/jkqtplot_test_and_lib.pro | 8 ++++---- 4 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 test/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro diff --git a/JKQtFastPlotterBuildAllExamples.pro b/JKQtFastPlotterBuildAllExamples.pro index 9af27bfb42..7cbcb1ed41 100644 --- a/JKQtFastPlotterBuildAllExamples.pro +++ b/JKQtFastPlotterBuildAllExamples.pro @@ -3,7 +3,5 @@ TEMPLATE = subdirs SUBDIRS += jkqtfastplotterlib \ jkqtfastplotter_test -jkqtfastplotterlib.file = lib/jkqtfastplotterlib.pro - -jkqtfastplotter_test.subdir = test/jkqtfastplotter_test -jkqtfastplotter_test.depends = jkqtfastplotterlib +jkqtfastplotterlib.file = $$PWD/lib/jkqtfastplotterlib.pro +jkqtfastplotter_test.file = $$PWD/test/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro diff --git a/lib/jkqtfastplotterlib.pro b/lib/jkqtfastplotterlib.pro index 03aa4f4d89..735b7bfa5e 100644 --- a/lib/jkqtfastplotterlib.pro +++ b/lib/jkqtfastplotterlib.pro @@ -1,6 +1,6 @@ TARGET = jkqtfastplotterlib TEMPLATE = lib -CONFIG+=staticlib +CONFIG+=staticlib dll include(jkqtfastplotter.pri) diff --git a/test/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro b/test/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro new file mode 100644 index 0000000000..4ede3051d6 --- /dev/null +++ b/test/jkqtfastplotter_test/jkqtfastplotter_test_and_lib.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += jkqtfastplotterlib jkqtfastplotter_test + +jkqtfastplotterlib.file = ../../lib/jkqtfastplotterlib.pro + +jkqtfastplotter_test.file=$$PWD/jkqtfastplotter_test.pro +jkqtfastplotter_test.depends = jkqtfastplotterlib diff --git a/test/jkqtplot_test/jkqtplot_test_and_lib.pro b/test/jkqtplot_test/jkqtplot_test_and_lib.pro index 4fd577910d..cefdc35d38 100644 --- a/test/jkqtplot_test/jkqtplot_test_and_lib.pro +++ b/test/jkqtplot_test/jkqtplot_test_and_lib.pro @@ -1,8 +1,8 @@ TEMPLATE = subdirs -SUBDIRS += jkqtplotterlib jkqtplottest +SUBDIRS += jkqtplot_test jkqtplotterlib + +jkqtplot_test.file=$$PWD/jkqtplot_test.pro +jkqtplot_test.depends = jkqtplotterlib jkqtplotterlib.file = ../../lib/jkqtplotterlib.pro - -jkqtplottest.file=$$PWD/jkqtplot_test.pro -jkqtplottest.depends = jkqtplotterlib