From b656063b0e2a6c5ef67444cd1c130b49fa9c709f Mon Sep 17 00:00:00 2001 From: Ma Aiguo Date: Tue, 31 May 2022 10:10:56 +0800 Subject: [PATCH] use system minizip lib --- application/CMakeLists.txt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index df33ffe..c377f2b 100755 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -119,6 +119,7 @@ find_package(DFrameworkdbus REQUIRED) find_package(RapidJSON) pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus) pkg_check_modules(XLSxwriter REQUIRED xlsxwriter) +pkg_check_modules(MiniZip REQUIRED minizip) find_package(Boost) find_package(XercesC) find_package(ZLIB) @@ -240,16 +241,6 @@ function(include_sub_directories_recursively root_dir) endforeach() endfunction() - -set (MINIZIP_SOURCES - ../3rdparty/minizip/ioapi.c -#../3rdparty/minizip/miniunz.c - ../3rdparty/minizip/minizip.c -../3rdparty/minizip/mztools.c -../3rdparty/minizip/unzip.c -../3rdparty/minizip/zip.c - ) - file(GLOB TMPFILE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/tmpfileplus/*.c) file(GLOB MD5SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/md5/*.c) #--------------------------------------------- @@ -290,11 +281,10 @@ execute_process(COMMAND bash ${APP_TRANS_SCRIPT} WORKING_DIRECTORY ${TS_DIR}) qt5_create_translation(APP_QM_FILES ${APP_TS_FILES} ${APP_QM_FILES}) -add_executable (${EXE_NAME} ${APP_CPP_FILES} ${APP_QRC_FILES} ${DOCX_CPP_FILES} ${APP_QM_FILES} ${MINIZIP_SOURCES} ${LXW_SOURCES} ${DOCXFAC_SOURCES} ${DOCXFAC_SOURCES_C} ${TMPFILE_SOURCES} ${MD5SOURCES} ) +add_executable (${EXE_NAME} ${APP_CPP_FILES} ${APP_QRC_FILES} ${DOCX_CPP_FILES} ${APP_QM_FILES} ${LXW_SOURCES} ${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/DocxFactory/include") include_sub_directories_recursively("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/md5") -include_sub_directories_recursively("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/minizip") include_sub_directories_recursively("${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/tmpfileplus") include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${DtkWidget_INCLUDE_DIRS}) @@ -304,6 +294,7 @@ include_directories( ${Qt5Gui_PRIVATE_INCLUDE_DIRS}) include_directories( ${Qt5Widgets_PRIVATE_INCLUDE_DIRS}) include_directories( ${DFrameworkDBus_INCLUDE_DIRS}) include_directories( ${XLSxwriter_INCLUDE_DIRS}) +include_directories( ${MiniZip_INCLUDE_DIRS}) include_directories( ${Boost_INCLUDE_DIRS}) include_directories( ${ZLIB_INCLUDE_DIRS}) message("ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}") @@ -311,7 +302,7 @@ include_directories( ${RapidJSON_INCLUDE_DIRS}) #include_directories(${ImageMagick_INCLUDE_DIRS}) include_directories(${XercesC_INCLUDE_DIRS}) -target_link_libraries(${EXE_NAME} ${LINK_LIBS} ${DFrameworkDBus_LIBRARIES} ${XLSxwriter_LIBRARIES} -lsystemd -licui18n -licuuc -ldl -fPIC) +target_link_libraries(${EXE_NAME} ${LINK_LIBS} ${DFrameworkDBus_LIBRARIES} ${XLSxwriter_LIBRARIES} ${MiniZip_LIBRARIES} -lsystemd -licui18n -licuuc -ldl -fPIC) target_link_libraries(${EXE_NAME} ${DtkWidget_LIBRARIES}) target_link_libraries(${EXE_NAME} ${DtkCore_LIBRARIES}) target_link_libraries(${EXE_NAME} ${DtkGUI_LIBRARIES}) -- 2.36.1