From c965d7725adb54fc34553c2f2972f0758706213e Mon Sep 17 00:00:00 2001 From: MultiMote Date: Wed, 26 Jan 2022 21:18:28 +0300 Subject: [PATCH 1/2] Fix CMake build * Add missing source files to the project * Add LRDesigner to the project * Fix qzint build --- 3rdparty/CMakeLists.txt | 101 +++++++++++++++++++++------------------- CMakeLists.txt | 11 +++-- designer/CMakeLists.txt | 18 +++++++ 3 files changed, 77 insertions(+), 53 deletions(-) create mode 100644 designer/CMakeLists.txt diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 21268f6..48b4484 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -2,61 +2,64 @@ find_package(PNG) +set(CMAKE_AUTOMOC ON) + set(ZINT_FILES - zint-2.10.0/backend/2of5.c \ - zint-2.10.0/backend/auspost.c \ - zint-2.10.0/backend/aztec.c \ - zint-2.10.0/backend/bmp.c \ - zint-2.10.0/backend/codablock.c \ - zint-2.10.0/backend/code.c \ - zint-2.10.0/backend/code1.c \ - zint-2.10.0/backend/code128.c \ - zint-2.10.0/backend/code16k.c \ - zint-2.10.0/backend/code49.c \ - zint-2.10.0/backend/common.c \ - zint-2.10.0/backend/composite.c \ - zint-2.10.0/backend/dmatrix.c \ - zint-2.10.0/backend/dotcode.c \ - zint-2.10.0/backend/eci.c \ - zint-2.10.0/backend/emf.c \ - zint-2.10.0/backend/gb18030.c \ - zint-2.10.0/backend/gb2312.c \ - zint-2.10.0/backend/general_field.c \ - zint-2.10.0/backend/gif.c \ - zint-2.10.0/backend/gridmtx.c \ - zint-2.10.0/backend/gs1.c \ - zint-2.10.0/backend/hanxin.c \ - zint-2.10.0/backend/imail.c \ - zint-2.10.0/backend/large.c \ - zint-2.10.0/backend/library.c \ - zint-2.10.0/backend/mailmark.c \ - zint-2.10.0/backend/maxicode.c \ - zint-2.10.0/backend/medical.c \ - zint-2.10.0/backend/output.c \ - zint-2.10.0/backend/pcx.c \ - zint-2.10.0/backend/pdf417.c \ - zint-2.10.0/backend/plessey.c \ - zint-2.10.0/backend/png.c \ - zint-2.10.0/backend/postal.c \ - zint-2.10.0/backend/ps.c \ - zint-2.10.0/backend/qr.c \ - zint-2.10.0/backend/raster.c \ - zint-2.10.0/backend/reedsol.c \ - zint-2.10.0/backend/rss.c \ - zint-2.10.0/backend/sjis.c \ - zint-2.10.0/backend/svg.c \ - zint-2.10.0/backend/telepen.c \ - zint-2.10.0/backend/tif.c \ - zint-2.10.0/backend/ultra.c \ - zint-2.10.0/backend/upcean.c \ - zint-2.10.0/backend/vector.c \ - zint-2.10.0/backend/dllversion.c \ + zint-2.10.0/backend/2of5.c + zint-2.10.0/backend/auspost.c + zint-2.10.0/backend/aztec.c + zint-2.10.0/backend/bmp.c + zint-2.10.0/backend/codablock.c + zint-2.10.0/backend/code.c + zint-2.10.0/backend/code1.c + zint-2.10.0/backend/code128.c + zint-2.10.0/backend/code16k.c + zint-2.10.0/backend/code49.c + zint-2.10.0/backend/common.c + zint-2.10.0/backend/composite.c + zint-2.10.0/backend/dmatrix.c + zint-2.10.0/backend/dotcode.c + zint-2.10.0/backend/eci.c + zint-2.10.0/backend/emf.c + zint-2.10.0/backend/gb18030.c + zint-2.10.0/backend/gb2312.c + zint-2.10.0/backend/general_field.c + zint-2.10.0/backend/gif.c + zint-2.10.0/backend/gridmtx.c + zint-2.10.0/backend/gs1.c + zint-2.10.0/backend/hanxin.c + zint-2.10.0/backend/imail.c + zint-2.10.0/backend/large.c + zint-2.10.0/backend/library.c + zint-2.10.0/backend/mailmark.c + zint-2.10.0/backend/maxicode.c + zint-2.10.0/backend/medical.c + zint-2.10.0/backend/output.c + zint-2.10.0/backend/pcx.c + zint-2.10.0/backend/pdf417.c + zint-2.10.0/backend/plessey.c + zint-2.10.0/backend/png.c + zint-2.10.0/backend/postal.c + zint-2.10.0/backend/ps.c + zint-2.10.0/backend/qr.c + zint-2.10.0/backend/raster.c + zint-2.10.0/backend/reedsol.c + zint-2.10.0/backend/rss.c + zint-2.10.0/backend/sjis.c + zint-2.10.0/backend/svg.c + zint-2.10.0/backend/telepen.c + zint-2.10.0/backend/tif.c + zint-2.10.0/backend/ultra.c + zint-2.10.0/backend/upcean.c + zint-2.10.0/backend/vector.c + zint-2.10.0/backend/dllversion.c zint-2.10.0/backend_qt/qzint.cpp + zint-2.10.0/backend_qt/qzint.h ) if (ENABLE_ZINT) - add_library(QZint STATIC ${ZINT_FILES}) + add_library(QZint STATIC ${ZINT_FILES}) target_include_directories(QZint PUBLIC zint-2.10.0/backend) target_include_directories(QZint PUBLIC zint-2.10.0/backend_qt) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d1b9c3..783a58b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ project(limereport) cmake_minimum_required(VERSION 3.14) set(LIMEREPORT_VERSION_MAJOR 1) -set(LIMEREPORT_VERSION_MINOR 5) -set(LIMEREPORT_VERSION_RELEASE 90) +set(LIMEREPORT_VERSION_MINOR 6) +set(LIMEREPORT_VERSION_RELEASE 4) option(ENABLE_ZINT "Enable libzint build for barcode support" OFF) option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF) @@ -35,6 +35,7 @@ if (Qt${QT_VERSION_MAJOR}Widgets_FOUND) endif() add_subdirectory(3rdparty) +add_subdirectory(designer EXCLUDE_FROM_ALL) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) @@ -81,13 +82,13 @@ ${PROJECT_NAME}/items/lrimageitem.cpp ${PROJECT_NAME}/items/lrimageitemeditor.cpp ${PROJECT_NAME}/items/lrlayoutmarker.cpp ${PROJECT_NAME}/items/lrshapeitem.cpp -${PROJECT_NAME}/items/lrsimpletagparser.cpp ${PROJECT_NAME}/items/lrsubitemparentpropitem.cpp ${PROJECT_NAME}/items/lrsvgitem.cpp ${PROJECT_NAME}/items/lrtextitem.cpp ${PROJECT_NAME}/items/lrtextitemeditor.cpp ${PROJECT_NAME}/items/lrverticallayout.cpp ${PROJECT_NAME}/lraboutdialog.cpp +${PROJECT_NAME}/lraxisdata.cpp ${PROJECT_NAME}/lrbanddesignintf.cpp ${PROJECT_NAME}/lrbandsmanager.cpp ${PROJECT_NAME}/lrbasedesignintf.cpp @@ -147,6 +148,7 @@ ${PROJECT_NAME}/scriptbrowser/lrscriptbrowser.cpp ${PROJECT_NAME}/scripteditor/lrcodeeditor.cpp ${PROJECT_NAME}/scripteditor/lrscripteditor.cpp ${PROJECT_NAME}/scripteditor/lrscripthighlighter.cpp +${PROJECT_NAME}/scripteditor/lrcompletermodel.cpp ${PROJECT_NAME}/serializators/lrxmlbasetypesserializators.cpp ${PROJECT_NAME}/serializators/lrxmlqrectserializator.cpp ${PROJECT_NAME}/serializators/lrxmlreader.cpp @@ -191,13 +193,13 @@ ${PROJECT_NAME}/items/lrimageitem.h ${PROJECT_NAME}/items/lrimageitemeditor.h ${PROJECT_NAME}/items/lrlayoutmarker.h ${PROJECT_NAME}/items/lrshapeitem.h -${PROJECT_NAME}/items/lrsimpletagparser.h ${PROJECT_NAME}/items/lrsubitemparentpropitem.h ${PROJECT_NAME}/items/lrsvgitem.h ${PROJECT_NAME}/items/lrtextitem.h ${PROJECT_NAME}/items/lrtextitemeditor.h ${PROJECT_NAME}/items/lrverticallayout.h ${PROJECT_NAME}/lraboutdialog.h +${PROJECT_NAME}/lraxisdata.h ${PROJECT_NAME}/lrbanddesignintf.h ${PROJECT_NAME}/lrbandsmanager.h ${PROJECT_NAME}/lrbasedesignintf.h @@ -262,6 +264,7 @@ ${PROJECT_NAME}/scriptbrowser/lrscriptbrowser.h ${PROJECT_NAME}/scripteditor/lrcodeeditor.h ${PROJECT_NAME}/scripteditor/lrscripteditor.h ${PROJECT_NAME}/scripteditor/lrscripthighlighter.h +${PROJECT_NAME}/scripteditor/lrcompletermodel.h ${PROJECT_NAME}/serializators/lrserializatorintf.h ${PROJECT_NAME}/serializators/lrstorageintf.h ${PROJECT_NAME}/serializators/lrxmlbasetypesserializators.h diff --git a/designer/CMakeLists.txt b/designer/CMakeLists.txt new file mode 100644 index 0000000..3f3ffe4 --- /dev/null +++ b/designer/CMakeLists.txt @@ -0,0 +1,18 @@ +set(CMAKE_AUTOMOC ON) + +set(LRDESIGNER_FILES + designersettingmanager.h + designersettingmanager.cpp + main.cpp + mainicon.rc +) + +add_executable(LRDesigner ${LRDESIGNER_FILES}) + +target_include_directories(LRDesigner PUBLIC ${PROJECT_SOURCE_DIR}/include) + +target_link_libraries(LRDesigner PUBLIC + Qt${QT_VERSION_MAJOR}::Core + Qt${QT_VERSION_MAJOR}::Widgets + ${PROJECT_NAME} +) From 63dd02033b3f4df762827cf683326d0d05d970fd Mon Sep 17 00:00:00 2001 From: Alexander Arin Date: Wed, 26 Jan 2022 23:36:28 +0300 Subject: [PATCH 2/2] target_compile_definitions for QZint has been fixed --- 3rdparty/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 48b4484..f1abd33 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -74,7 +74,7 @@ if (ENABLE_ZINT) if(PNG_FOUND) target_link_libraries(QZint PRIVATE PNG::PNG) else(PNG_FOUND) - target_compile_definitions(QZint -DNO_PNG) + target_compile_definitions(QZint PRIVATE -DNO_PNG) endif(PNG_FOUND) endif(ENABLE_ZINT)