Fix build after recent commit, also simplify project file

This commit is contained in:
Razi Alavizadeh 2018-12-08 02:47:32 +03:30
parent 9b4d793447
commit 0023c05f51

View File

@ -2,25 +2,8 @@ TEMPLATE = subdirs
SUBDIRS += jkqtplotterlib \ SUBDIRS += jkqtplotterlib \
jkqtmathtext_simpletest \ jkqtmathtext_simpletest \
jkqtplotter_simpletest_symbols_and_styles \ jkqtplot_test \
jkqtplotter_simpletest_symbols_and_errors \
jkqtplotter_simpletest_stackedbars \
jkqtplotter_simpletest_logaxes \
jkqtplotter_simpletest_imageplot_modifier \
jkqtplotter_simpletest_imageplot \
jkqtplotter_simpletest_errorbarstyles \
jkqtplotter_simpletest_dateaxes \
jkqtplotter_simpletest_barchart \
jkqtplotter_simpletest \ jkqtplotter_simpletest \
jkqtplotter_simpletest_speed \
jkqtplotter_simpletest_rgbimageplot_qt \
jkqtplot_test
#jkqtplotter_simpletest_imageplot_nodatastore \
#jkqtplotter_simpletest_rgbimageplot_opencv \
#jkqtplotter_simpletest_imageplot_opencv \
jkqtplotterlib.file = lib/jkqtplotterlib.pro jkqtplotterlib.file = lib/jkqtplotterlib.pro
@ -34,45 +17,33 @@ jkqtmathtext_test.depends = jkqtplotterlib
jkqtplot_test.subdir = test/jkqtplot_test jkqtplot_test.subdir = test/jkqtplot_test
jkqtplot_test.depends = jkqtplotterlib jkqtplot_test.depends = jkqtplotterlib
jkqtplotter_simpletest.subdir = test/simpletest jkqtplotter_simpletest.file = test/simpletest/jkqtplotter_simpletest.pro
jkqtplotter_simpletest.depends = jkqtplotterlib jkqtplotter_simpletest.depends = jkqtplotterlib
jkqtplotter_simpletest_barchart.subdir = test/simpletest_barchart defineTest(addSimpleTest) {
jkqtplotter_simpletest_barchart.depends = jkqtplotterlib test_name = $$1
SUBDIRS += jkqtplotter_simpletest_$${test_name}
jkqtplotter_simpletest_dateaxes.subdir = test/simpletest_dateaxes jkqtplotter_simpletest_$${test_name}.file = test/simpletest_$${test_name}/jkqtplotter_simpletest_$${test_name}.pro
jkqtplotter_simpletest_dateaxes.depends = jkqtplotterlib jkqtplotter_simpletest_$${test_name}.depends = jkqtplotterlib
jkqtplotter_simpletest_errorbarstyles.subdir = test/simpletest_errorbarstyles export (jkqtplotter_simpletest_$${test_name}.file)
jkqtplotter_simpletest_errorbarstyles.depends = jkqtplotterlib export (jkqtplotter_simpletest_$${test_name}.depends)
jkqtplotter_simpletest_imageplot.subdir = test/simpletest_imageplot export (SUBDIRS)
jkqtplotter_simpletest_imageplot.depends = jkqtplotterlib }
jkqtplotter_simpletest_imageplot_modifier.subdir = test/simpletest_imageplot_modifier addSimpleTest(barchart)
jkqtplotter_simpletest_imageplot_modifier.depends = jkqtplotterlib addSimpleTest(dateaxes)
addSimpleTest(errorbarstyles)
jkqtplotter_simpletest_imageplot_nodatastore.subdir = test/simpletest_imageplot_nodatastore addSimpleTest(imageplot)
jkqtplotter_simpletest_imageplot_nodatastore.depends = jkqtplotterlib addSimpleTest(imageplot_modifier)
addSimpleTest(logaxes)
jkqtplotter_simpletest_imageplot_opencv.subdir = test/simpletest_imageplot_opencv addSimpleTest(stackedbars)
addSimpleTest(symbols_and_errors)
jkqtplotter_simpletest_logaxes.subdir = test/simpletest_logaxes addSimpleTest(symbols_and_styles)
jkqtplotter_simpletest_logaxes.depends = jkqtplotterlib addSimpleTest(speed)
addSimpleTest(rgbimageplot_qt)
jkqtplotter_simpletest_rgbimageplot_opencv.subdir = test/simpletest_rgbimageplot_opencv #addSimpleTest(imageplot_nodatastore)
#addSimpleTest(rgbimageplot_opencv)
jkqtplotter_simpletest_stackedbars.subdir = test/simpletest_stackedbars #addSimpleTest(imageplot_opencv)
jkqtplotter_simpletest_stackedbars.depends = jkqtplotterlib
jkqtplotter_simpletest_symbols_and_errors.subdir = test/simpletest_symbols_and_errors
jkqtplotter_simpletest_symbols_and_errors.depends = jkqtplotterlib
jkqtplotter_simpletest_symbols_and_styles.subdir = test/simpletest_symbols_and_styles
jkqtplotter_simpletest_symbols_and_styles.depends = jkqtplotterlib
jkqtplotter_simpletest_speed.subdir = test/simpletest_speed
jkqtplotter_simpletest_speed.depends = jkqtplotterlib
jkqtplotter_simpletest_rgbimageplot_qt.subdir = test/simpletest_rgbimageplot_qt
jkqtplotter_simpletest_rgbimageplot_qt.depends = jkqtplotterlib