mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

Fix CMake build

Browse Source 
* Add missing source files to the project
* Add LRDesigner to the project
* Fix qzint build
This commit is contained in:
MultiMote 2022-01-26 21:18:28 +03:00
parent 4991c5d782
commit c965d7725a
3 changed files with 77 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
3rdparty/CMakeLists.txt vendored
View File

@ -2,61 +2,64 @@
find_package(PNG) find_package(PNG)
set(CMAKE_AUTOMOC ON)
set(ZINT_FILES set(ZINT_FILES
zint-2.10.0/backend/2of5.c \ zint-2.10.0/backend/2of5.c
zint-2.10.0/backend/auspost.c \ zint-2.10.0/backend/auspost.c
zint-2.10.0/backend/aztec.c \ zint-2.10.0/backend/aztec.c
zint-2.10.0/backend/bmp.c \ zint-2.10.0/backend/bmp.c
zint-2.10.0/backend/codablock.c \ zint-2.10.0/backend/codablock.c
zint-2.10.0/backend/code.c \ zint-2.10.0/backend/code.c
zint-2.10.0/backend/code1.c \ zint-2.10.0/backend/code1.c
zint-2.10.0/backend/code128.c \ zint-2.10.0/backend/code128.c
zint-2.10.0/backend/code16k.c \ zint-2.10.0/backend/code16k.c
zint-2.10.0/backend/code49.c \ zint-2.10.0/backend/code49.c
zint-2.10.0/backend/common.c \ zint-2.10.0/backend/common.c
zint-2.10.0/backend/composite.c \ zint-2.10.0/backend/composite.c
zint-2.10.0/backend/dmatrix.c \ zint-2.10.0/backend/dmatrix.c
zint-2.10.0/backend/dotcode.c \ zint-2.10.0/backend/dotcode.c
zint-2.10.0/backend/eci.c \ zint-2.10.0/backend/eci.c
zint-2.10.0/backend/emf.c \ zint-2.10.0/backend/emf.c
zint-2.10.0/backend/gb18030.c \ zint-2.10.0/backend/gb18030.c
zint-2.10.0/backend/gb2312.c \ zint-2.10.0/backend/gb2312.c
zint-2.10.0/backend/general_field.c \ zint-2.10.0/backend/general_field.c
zint-2.10.0/backend/gif.c \ zint-2.10.0/backend/gif.c
zint-2.10.0/backend/gridmtx.c \ zint-2.10.0/backend/gridmtx.c
zint-2.10.0/backend/gs1.c \ zint-2.10.0/backend/gs1.c
zint-2.10.0/backend/hanxin.c \ zint-2.10.0/backend/hanxin.c
zint-2.10.0/backend/imail.c \ zint-2.10.0/backend/imail.c
zint-2.10.0/backend/large.c \ zint-2.10.0/backend/large.c
zint-2.10.0/backend/library.c \ zint-2.10.0/backend/library.c
zint-2.10.0/backend/mailmark.c \ zint-2.10.0/backend/mailmark.c
zint-2.10.0/backend/maxicode.c \ zint-2.10.0/backend/maxicode.c
zint-2.10.0/backend/medical.c \ zint-2.10.0/backend/medical.c
zint-2.10.0/backend/output.c \ zint-2.10.0/backend/output.c
zint-2.10.0/backend/pcx.c \ zint-2.10.0/backend/pcx.c
zint-2.10.0/backend/pdf417.c \ zint-2.10.0/backend/pdf417.c
zint-2.10.0/backend/plessey.c \ zint-2.10.0/backend/plessey.c
zint-2.10.0/backend/png.c \ zint-2.10.0/backend/png.c
zint-2.10.0/backend/postal.c \ zint-2.10.0/backend/postal.c
zint-2.10.0/backend/ps.c \ zint-2.10.0/backend/ps.c
zint-2.10.0/backend/qr.c \ zint-2.10.0/backend/qr.c
zint-2.10.0/backend/raster.c \ zint-2.10.0/backend/raster.c
zint-2.10.0/backend/reedsol.c \ zint-2.10.0/backend/reedsol.c
zint-2.10.0/backend/rss.c \ zint-2.10.0/backend/rss.c
zint-2.10.0/backend/sjis.c \ zint-2.10.0/backend/sjis.c
zint-2.10.0/backend/svg.c \ zint-2.10.0/backend/svg.c
zint-2.10.0/backend/telepen.c \ zint-2.10.0/backend/telepen.c
zint-2.10.0/backend/tif.c \ zint-2.10.0/backend/tif.c
zint-2.10.0/backend/ultra.c \ zint-2.10.0/backend/ultra.c
zint-2.10.0/backend/upcean.c \ zint-2.10.0/backend/upcean.c
zint-2.10.0/backend/vector.c \ zint-2.10.0/backend/vector.c
zint-2.10.0/backend/dllversion.c \ zint-2.10.0/backend/dllversion.c
zint-2.10.0/backend_qt/qzint.cpp zint-2.10.0/backend_qt/qzint.cpp
zint-2.10.0/backend_qt/qzint.h
) )
if (ENABLE_ZINT) 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)
target_include_directories(QZint PUBLIC zint-2.10.0/backend_qt) target_include_directories(QZint PUBLIC zint-2.10.0/backend_qt)

11
CMakeLists.txt
View File

@ -2,8 +2,8 @@ project(limereport)
cmake_minimum_required(VERSION 3.14) cmake_minimum_required(VERSION 3.14)
set(LIMEREPORT_VERSION_MAJOR 1) set(LIMEREPORT_VERSION_MAJOR 1)
set(LIMEREPORT_VERSION_MINOR 5) set(LIMEREPORT_VERSION_MINOR 6)
set(LIMEREPORT_VERSION_RELEASE 90) set(LIMEREPORT_VERSION_RELEASE 4)
option(ENABLE_ZINT "Enable libzint build for barcode support" OFF) option(ENABLE_ZINT "Enable libzint build for barcode support" OFF)
option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF) option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF)
@ -35,6 +35,7 @@ if (Qt${QT_VERSION_MAJOR}Widgets_FOUND)
endif() endif()
add_subdirectory(3rdparty) add_subdirectory(3rdparty)
add_subdirectory(designer EXCLUDE_FROM_ALL)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
@ -81,13 +82,13 @@ ${PROJECT_NAME}/items/lrimageitem.cpp
${PROJECT_NAME}/items/lrimageitemeditor.cpp ${PROJECT_NAME}/items/lrimageitemeditor.cpp
${PROJECT_NAME}/items/lrlayoutmarker.cpp ${PROJECT_NAME}/items/lrlayoutmarker.cpp
${PROJECT_NAME}/items/lrshapeitem.cpp ${PROJECT_NAME}/items/lrshapeitem.cpp
${PROJECT_NAME}/items/lrsimpletagparser.cpp
${PROJECT_NAME}/items/lrsubitemparentpropitem.cpp ${PROJECT_NAME}/items/lrsubitemparentpropitem.cpp
${PROJECT_NAME}/items/lrsvgitem.cpp ${PROJECT_NAME}/items/lrsvgitem.cpp
${PROJECT_NAME}/items/lrtextitem.cpp ${PROJECT_NAME}/items/lrtextitem.cpp
${PROJECT_NAME}/items/lrtextitemeditor.cpp ${PROJECT_NAME}/items/lrtextitemeditor.cpp
${PROJECT_NAME}/items/lrverticallayout.cpp ${PROJECT_NAME}/items/lrverticallayout.cpp
${PROJECT_NAME}/lraboutdialog.cpp ${PROJECT_NAME}/lraboutdialog.cpp
${PROJECT_NAME}/lraxisdata.cpp
${PROJECT_NAME}/lrbanddesignintf.cpp ${PROJECT_NAME}/lrbanddesignintf.cpp
${PROJECT_NAME}/lrbandsmanager.cpp ${PROJECT_NAME}/lrbandsmanager.cpp
${PROJECT_NAME}/lrbasedesignintf.cpp ${PROJECT_NAME}/lrbasedesignintf.cpp
@ -147,6 +148,7 @@ ${PROJECT_NAME}/scriptbrowser/lrscriptbrowser.cpp
${PROJECT_NAME}/scripteditor/lrcodeeditor.cpp ${PROJECT_NAME}/scripteditor/lrcodeeditor.cpp
${PROJECT_NAME}/scripteditor/lrscripteditor.cpp ${PROJECT_NAME}/scripteditor/lrscripteditor.cpp
${PROJECT_NAME}/scripteditor/lrscripthighlighter.cpp ${PROJECT_NAME}/scripteditor/lrscripthighlighter.cpp
${PROJECT_NAME}/scripteditor/lrcompletermodel.cpp
${PROJECT_NAME}/serializators/lrxmlbasetypesserializators.cpp ${PROJECT_NAME}/serializators/lrxmlbasetypesserializators.cpp
${PROJECT_NAME}/serializators/lrxmlqrectserializator.cpp ${PROJECT_NAME}/serializators/lrxmlqrectserializator.cpp
${PROJECT_NAME}/serializators/lrxmlreader.cpp ${PROJECT_NAME}/serializators/lrxmlreader.cpp
@ -191,13 +193,13 @@ ${PROJECT_NAME}/items/lrimageitem.h
${PROJECT_NAME}/items/lrimageitemeditor.h ${PROJECT_NAME}/items/lrimageitemeditor.h
${PROJECT_NAME}/items/lrlayoutmarker.h ${PROJECT_NAME}/items/lrlayoutmarker.h
${PROJECT_NAME}/items/lrshapeitem.h ${PROJECT_NAME}/items/lrshapeitem.h
${PROJECT_NAME}/items/lrsimpletagparser.h
${PROJECT_NAME}/items/lrsubitemparentpropitem.h ${PROJECT_NAME}/items/lrsubitemparentpropitem.h
${PROJECT_NAME}/items/lrsvgitem.h ${PROJECT_NAME}/items/lrsvgitem.h
${PROJECT_NAME}/items/lrtextitem.h ${PROJECT_NAME}/items/lrtextitem.h
${PROJECT_NAME}/items/lrtextitemeditor.h ${PROJECT_NAME}/items/lrtextitemeditor.h
${PROJECT_NAME}/items/lrverticallayout.h ${PROJECT_NAME}/items/lrverticallayout.h
${PROJECT_NAME}/lraboutdialog.h ${PROJECT_NAME}/lraboutdialog.h
${PROJECT_NAME}/lraxisdata.h
${PROJECT_NAME}/lrbanddesignintf.h ${PROJECT_NAME}/lrbanddesignintf.h
${PROJECT_NAME}/lrbandsmanager.h ${PROJECT_NAME}/lrbandsmanager.h
${PROJECT_NAME}/lrbasedesignintf.h ${PROJECT_NAME}/lrbasedesignintf.h
@ -262,6 +264,7 @@ ${PROJECT_NAME}/scriptbrowser/lrscriptbrowser.h
${PROJECT_NAME}/scripteditor/lrcodeeditor.h ${PROJECT_NAME}/scripteditor/lrcodeeditor.h
${PROJECT_NAME}/scripteditor/lrscripteditor.h ${PROJECT_NAME}/scripteditor/lrscripteditor.h
${PROJECT_NAME}/scripteditor/lrscripthighlighter.h ${PROJECT_NAME}/scripteditor/lrscripthighlighter.h
${PROJECT_NAME}/scripteditor/lrcompletermodel.h
${PROJECT_NAME}/serializators/lrserializatorintf.h ${PROJECT_NAME}/serializators/lrserializatorintf.h
${PROJECT_NAME}/serializators/lrstorageintf.h ${PROJECT_NAME}/serializators/lrstorageintf.h
${PROJECT_NAME}/serializators/lrxmlbasetypesserializators.h ${PROJECT_NAME}/serializators/lrxmlbasetypesserializators.h

18
designer/CMakeLists.txt Normal file
View File

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