diff --git a/CMakeLists.txt b/CMakeLists.txt index 783a58b..6ba0f51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14) set(LIMEREPORT_VERSION_MAJOR 1) set(LIMEREPORT_VERSION_MINOR 6) -set(LIMEREPORT_VERSION_RELEASE 4) +set(LIMEREPORT_VERSION_RELEASE 6) option(ENABLE_ZINT "Enable libzint build for barcode support" OFF) option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF) @@ -36,6 +36,7 @@ endif() add_subdirectory(3rdparty) add_subdirectory(designer EXCLUDE_FROM_ALL) +add_subdirectory(demo_r1 EXCLUDE_FROM_ALL) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) @@ -66,6 +67,7 @@ ${PROJECT_NAME}/databrowser/lrvariabledialog.cpp ${PROJECT_NAME}/exporters/lrpdfexporter.cpp ${PROJECT_NAME}/items/charts/lrhorizontalbarchart.cpp ${PROJECT_NAME}/items/charts/lrlineschart.cpp +${PROJECT_NAME}/items/charts/lrgridlineschart.cpp ${PROJECT_NAME}/items/charts/lrpiechart.cpp ${PROJECT_NAME}/items/charts/lrverticalbarchart.cpp ${PROJECT_NAME}/items/editors/lrfonteditorwidget.cpp @@ -176,6 +178,7 @@ ${PROJECT_NAME}/databrowser/lrvariabledialog.h ${PROJECT_NAME}/exporters/lrpdfexporter.h ${PROJECT_NAME}/items/charts/lrhorizontalbarchart.h ${PROJECT_NAME}/items/charts/lrlineschart.h +${PROJECT_NAME}/items/charts/lrgridlineschart.h ${PROJECT_NAME}/items/charts/lrpiechart.h ${PROJECT_NAME}/items/charts/lrverticalbarchart.h ${PROJECT_NAME}/items/editors/lrfonteditorwidget.h @@ -276,7 +279,6 @@ ${PROJECT_NAME}/translationeditor/languageselectdialog.h ${PROJECT_NAME}/translationeditor/translationeditor.h - ${PROJECT_NAME}/databrowser/lrconnectiondialog.ui ${PROJECT_NAME}/databrowser/lrdatabrowser.ui ${PROJECT_NAME}/databrowser/lrsqleditdialog.ui diff --git a/demo_r1/CMakeLists.txt b/demo_r1/CMakeLists.txt new file mode 100644 index 0000000..a694da1 --- /dev/null +++ b/demo_r1/CMakeLists.txt @@ -0,0 +1,23 @@ +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTORCC ON) + +set(PROJECT_SOURCES + main.cpp + mainwindow.cpp + mainwindow.h + mainwindow.ui +) + +add_executable(demo_r1 main.cpp ${PROJECT_SOURCES}) + +target_include_directories( demo_r1 PRIVATE ../include/ ) +target_link_libraries(demo_r1 PRIVATE + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::Widgets + Qt${QT_VERSION_MAJOR}::PrintSupport + Qt${QT_VERSION_MAJOR}::Qml + Qt${QT_VERSION_MAJOR}::Sql + ${PROJECT_NAME} +) +