This commit is contained in:
2025-05-08 21:02:56 +03:00
parent 6706cbec45
commit 86a11faf70
24 changed files with 1022 additions and 460 deletions

View File

@@ -62,12 +62,12 @@ set(CMAKE_AUTOUIC_SEARCH_PATHS scenes)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(Qt5Core REQUIRED)
find_package(Qt6Core REQUIRED)
if (BUILD_TRANSLATIONS)
find_package(Qt5 REQUIRED COMPONENTS LinguistTools)
find_package(Qt6 REQUIRED COMPONENTS LinguistTools)
endif()
find_package(Qt5Gui REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt6Gui REQUIRED)
find_package(Qt6Widgets REQUIRED)
set(TRANSLATION_SOURCES
main.cpp
@@ -95,6 +95,9 @@ set(PROJECT_SOURCES
net/net.h net/net.cpp
settings/settings.h settings/settings.cpp
widgets/tablewidgetmovable.hpp widgets/tablewidgetmovable.cpp
widgets/checklistviewwidget.h widgets/checklistviewwidget.cpp
${TRANSLATION_SOURCES}
)
@@ -111,7 +114,7 @@ if (BUILD_OFD_BINARYEYE_SCAN)
endif()
if (BUILD_EMAIL_MODE)
list(APPEND PROJECT_SOURCES email_parser/emailparser.h email_parser/emailparser.cpp)
# list(APPEND PROJECT_SOURCES email_parser/emailparser.h email_parser/emailparser.cpp)
list(APPEND PROJECT_SOURCES utils/base64.h utils/base64.cpp)
endif()
@@ -122,9 +125,9 @@ if (BUILD_TRANSLATIONS)
translations/ru_RU.ts
)
qt5_create_translation(QM_FILES "${TRANSLATION_SOURCES}" ${TS_FILES})
qt_create_translation(QM_FILES "${TRANSLATION_SOURCES}" ${TS_FILES})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY)
qt5_add_resources(TRANSLATIONQRC ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
qt_add_resources(TRANSLATIONQRC ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc)
add_custom_target(translations ALL DEPENDS ${QM_FILES})
add_custom_target(resources ALL DEPENDS ${TRANSLATIONQRC})
add_dependencies(resources translations)
@@ -133,13 +136,13 @@ endif()
# Media QRC
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/media.qrc ${CMAKE_CURRENT_BINARY_DIR}/media.qrc COPYONLY)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
qt5_add_resources(MEDIAQRC ${CMAKE_CURRENT_BINARY_DIR}/media.qrc)
qt_add_resources(MEDIAQRC ${CMAKE_CURRENT_BINARY_DIR}/media.qrc)
add_custom_target(mediaresource ALL DEPENDS ${MEDIAQRC})
#Scenes QRC
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scenes.qrc ${CMAKE_CURRENT_BINARY_DIR}/scenes.qrc COPYONLY)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/scenes DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
qt5_add_resources(SCENESQRC ${CMAKE_CURRENT_BINARY_DIR}/scenes.qrc)
qt_add_resources(SCENESQRC ${CMAKE_CURRENT_BINARY_DIR}/scenes.qrc)
add_custom_target(scenessource ALL DEPENDS ${SCENESQRC})
set(SOURCES "")
@@ -163,7 +166,9 @@ else()
)
endif()
target_link_libraries(checks-parser PRIVATE Qt5::Widgets)
target_link_libraries(checks-parser PRIVATE Qt6::Widgets)
target_include_directories(checks-parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/widgets)
if (BUILD_OFD_LOCAL_QR_SCAN)
target_include_directories(checks-parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/image_redactor)
@@ -219,6 +224,11 @@ if (BUILD_OFD_LOCAL_QR_SCAN OR BUILD_OFD_BINARYEYE_SCAN)
include_directories( ${OpenCV_INCLUDE_DIRS} )
endif()
# if (BUILD_EMAIL_MODE)
# find_package(vmime REQUIRED)
# target_link_libraries(checks-parser PRIVATE vmime)
# endif()
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
target_link_libraries(checks-parser PRIVATE -lstdc++fs)
endif()