mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-11-15 18:15:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

several minor bugfixes to QMake build system

Browse Source
This commit is contained in:
jkriege2 2020-10-19 16:05:18 +02:00
parent 82cef279a3
commit fc7622e901
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
JKQtPlotterBuildAllExamples.pro
View File

@ -33,9 +33,12 @@ jkqtmathtext_simpletest.depends = jkqtmathtextlib
jkqtmathtext_test.subdir = examples/jkqtmathtext_test jkqtmathtext_test.subdir = examples/jkqtmathtext_test
jkqtmathtext_test.depends = jkqtplotterlib jkqtmathtext_test.depends = jkqtplotterlib
jkqtplotter_simpletest.file = examples/simpletest/jkqtplotter_simpletest.pro jkqtplotter_simpletest.file = examples/simpletest/simpletest.pro
jkqtplotter_simpletest.depends = jkqtplotterlib 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.file = $$PWD/examples/jkqtfastplotter_test/jkqtfastplotter_test.pro
jkqtfastplotter_test.depends = jkqtfastplotterlib jkqtfastplotter_test.depends = jkqtfastplotterlib

8
examples/jkqtmathtext_simpletest/jkqtmathtext_simpletest.pro
View File

@ -8,12 +8,12 @@ QT += core gui xml svg
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
DEPENDPATH += ../../../lib ../../../qmake/staticlib/jkqtplotterlib DEPENDPATH += ../../lib ../../qmake/staticlib/jkqtplotterlib
INCLUDEPATH += ../../../lib INCLUDEPATH += ../../lib
CONFIG (debug, debug|release) { CONFIG (debug, debug|release) {
LIBS += -L../../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug LIBS += -L../../qmake/staticlib/jkqtplotterlib/debug -ljkqtplotterlib_debug
} else { } else {
LIBS += -L../../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib LIBS += -L../../qmake/staticlib/jkqtplotterlib/release -ljkqtplotterlib
} }
message("LIBS = $$LIBS") message("LIBS = $$LIBS")

2
examples/jkqtplot_test/jkqtpemfengineadapter.h
View File

@ -4,7 +4,7 @@
#include "EmfEngine/src/EmfEngine.h" #include "EmfEngine/src/EmfEngine.h"
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include "../../../jkqtpbaseplotter.h" #include "../../lib/jkqtplotter/jkqtpbaseplotter.h"
class JKQTPEmfEngineAdapter : public JKQTPPaintDeviceAdapter class JKQTPEmfEngineAdapter : public JKQTPPaintDeviceAdapter
{ {

9
examples/mandelbrot/mandelbrot.pro
View File

@ -1,5 +1,12 @@
# source code for this simple demo # source code for this simple demo
SOURCES = mandelbrot.cpp SOURCES = mandelbrot.cpp \
mandelbrotmainwindow.cpp
HEADERS = mandelbrotmainwindow.h
FORMS = mandelbrotmainwindow.ui
# configure Qt # configure Qt
CONFIG += link_prl qt CONFIG += link_prl qt

2
lib/jkqtplotter/CMakeLists.txt
View File

@ -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" ) 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}")