1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
From: Boyuan Yang <byang@debian.org>
Date: Tue, 11 Feb 2025 19:45:39 -0500
Subject: use system libxlsxwriter
---
application/CMakeLists.txt | 11 ++++-------
application/logsegementexportthread.h | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index 00def59..d4b48b7 100755
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -109,6 +109,7 @@ else()
endif()
message(" >>> Build with DTK: ${DTK_VERSION_MAJOR}")
pkg_check_modules(MiniZip REQUIRED minizip)
+pkg_check_modules(XLSxwriter REQUIRED xlsxwriter)
find_package(Qt${QT_DESIRED_VERSION} REQUIRED COMPONENTS ${qt_required_components})
find_package(Dtk${DTK_VERSION_MAJOR} COMPONENTS Core Gui Widget REQUIRED)
@@ -136,8 +137,6 @@ endif()
message("XercesC_FOUND ${XercesC_FOUND}")
message("zlib version: " ${ZLIB_LIBRARIES})
-list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS})
-
set (APP_CPP_FILES
main.cpp
cliapplicationhelper.cpp
@@ -243,10 +242,6 @@ function(include_sub_directories_recursively root_dir)
endforeach()
endfunction()
-#--------------------libxlsx源码引入---------------------------------
-file(GLOB LXW_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/libxlsxwriter/src/*.c)
-file(GLOB_RECURSE LXW_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/libxlsxwriter/include *.h)
-
file(GLOB TMPFILE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/tmpfileplus/*.c)
file(GLOB MD5SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/md5/*.c)
#---------------------------------------------
@@ -277,7 +272,7 @@ foreach(_ts_file ${TS_FILES})
endforeach()
#lupdate end
-add_executable (${EXE_NAME} ${APP_CPP_FILES} ${APP_QRC_FILES} ${DOCX_CPP_FILES} ${LXW_SOURCES} ${DOCXFAC_SOURCES} ${DOCXFAC_SOURCES_C} ${TMPFILE_SOURCES} ${MD5SOURCES} )
+add_executable (${EXE_NAME} ${APP_CPP_FILES} ${APP_QRC_FILES} ${DOCX_CPP_FILES} ${DOCXFAC_SOURCES} ${DOCXFAC_SOURCES_C} ${TMPFILE_SOURCES} ${MD5SOURCES} )
include_sub_directories_recursively("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/docx")
include_sub_directories_recursively("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/libxlsxwriter")
include_sub_directories_recursively("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/DocxFactory/include")
@@ -285,6 +280,7 @@ include_sub_directories_recursively("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/md5
include_sub_directories_recursively("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/tmpfileplus")
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories( ${MiniZip_INCLUDE_DIRS})
+include_directories( ${XLSxwriter_INCLUDE_DIRS})
include_directories( ${Boost_INCLUDE_DIRS})
include_directories( ${ZLIB_INCLUDE_DIRS})
message("ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}")
@@ -303,6 +299,7 @@ target_link_libraries(${EXE_NAME} ${XercesC_LIBRARIES})
#target_link_libraries(${EXE_NAME} ${CMAKE_BINARY_DIR}/3rdparty/libxlsxwriter/libxlsxwriter.a)
target_link_libraries(${EXE_NAME} ${MiniZip_LIBRARIES})
+target_link_libraries(${EXE_NAME} ${XLSxwriter_LIBRARIES})
#target_link_libraries(${EXE_NAME} ${Zint_LIBRARIES})
#target_link_libraries(${EXE_NAME} ${RapidJSON_LIBRARIES})
diff --git a/application/logsegementexportthread.h b/application/logsegementexportthread.h
index 5bcffca..b828eec 100644
--- a/application/logsegementexportthread.h
+++ b/application/logsegementexportthread.h
@@ -6,7 +6,7 @@
#define LOGSEGEMENTEXPORTTHREAD_H
#include "structdef.h"
#include "WordProcessingMerger.h"
-#include "workbook.h"
+#include <xlsxwriter/workbook.h>
#include <QRunnable>
#include <QObject>
|
