From 24fcaee58de61a94353d30a27add2e7d9768f78a Mon Sep 17 00:00:00 2001
From: jihanyu <1136733867@qq.com>
Date: Tue, 21 Feb 2023 14:33:21 +0800
Subject: [PATCH] build_add_zlib

---
 CMakeLists.txt                       | 1 +
 src/client/CMakeLists.txt            | 2 +-
 src/server/CMakeLists.txt            | 4 ++--
 src/tools/dcc_ctl/CMakeLists.txt     | 2 +-
 src/tools/dcc_encrypt/CMakeLists.txt | 2 +-
 test/test_main/CMakeLists.txt        | 4 +++-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44e53d2..31a2937 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,6 +166,7 @@ set(3rd_libssl "ssl")
 set(3rd_lib_crypto "crypto")
 set(3rd_libjson "cjson")
 set(3rd_libcbb "cbb_static")
+set(3rd_libz "z")
 
 add_subdirectory(src)
 OPTION(TEST "option for test module" OFF)
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index bc2a892..f6bc35f 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -24,4 +24,4 @@ add_compile_definitions(GETLIBVERSION=${DD_GETLIBVERSION})
 # output client so
 set(CLIENT_SRC_LIST ${CLIENT_SRC})
 add_library(dcc_driver SHARED ${CLIENT_SRC_LIST})
-target_link_libraries(dcc_driver utils network pthread dl rt ${HIDDEN_LIBS} -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libcbb} ${3rd_libssl} -Wl,--no-whole-archive)
+target_link_libraries(dcc_driver utils network pthread dl rt ${HIDDEN_LIBS} -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libcbb} ${3rd_libssl} ${3rd_libz} -Wl,--no-whole-archive)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index e0ec874..31515cd 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -38,7 +38,7 @@ set(DCC_SO_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/srv_cmd_exe.c
 )
 add_library(dcc SHARED ${DCC_SO_SRC})
-target_link_libraries(dcc storage dcf executor utils pthread dl rt ${HIDDEN_LIBS} ${G_BIN_EXT_LIBS} ${3rd_libzstd} ${3rd_libssl} ${3rd_lib_crypto} ${3rd_liblz4} ${3rd_libjson} -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libcbb} -Wl,--no-whole-archive)
+target_link_libraries(dcc storage dcf executor utils pthread dl rt ${HIDDEN_LIBS} ${G_BIN_EXT_LIBS} ${3rd_libzstd} ${3rd_libssl} ${3rd_lib_crypto} ${3rd_liblz4} ${3rd_libjson} -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libcbb} ${3rd_libz} -Wl,--no-whole-archive)
 target_include_directories(dcc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 # output server bin
 
@@ -48,7 +48,7 @@ set(DCC_EXE_SRC
 )
 
 add_executable(dcc_server ${DCC_EXE_SRC})
-target_link_libraries(dcc_server storage dcf executor utils pthread dl rt ${HIDDEN_LIBS} ${3rd_libzstd} ${3rd_libssl} ${3rd_lib_crypto} ${3rd_liblz4} ${3rd_libjson} -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libcbb} -Wl,--no-whole-archive)
+target_link_libraries(dcc_server storage dcf executor utils pthread dl rt ${HIDDEN_LIBS} ${3rd_libzstd} ${3rd_libssl} ${3rd_lib_crypto} ${3rd_liblz4} ${3rd_libjson} -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libcbb} ${3rd_libz} -Wl,--no-whole-archive)
 target_include_directories(dcc_server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 set_target_properties(dcc_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 set_target_properties(dcc_server PROPERTIES LINKER_LANGUAGE "C")
\ No newline at end of file
diff --git a/src/tools/dcc_ctl/CMakeLists.txt b/src/tools/dcc_ctl/CMakeLists.txt
index cc9dba9..ff7882e 100644
--- a/src/tools/dcc_ctl/CMakeLists.txt
+++ b/src/tools/dcc_ctl/CMakeLists.txt
@@ -17,6 +17,6 @@ aux_source_directory(${DCC_CTL_PATH} CTL_SRC)
 # output client bin
 set(CTL_SRC_LIST  ${CTL_SRC})
 add_executable(dcc_ctl ${CTL_SRC_LIST})
-target_link_libraries(dcc_ctl utils dcc_driver pthread dl rt ${HIDDEN_LIBS} ${3rd_libzstd} ${3rd_libssl} ${3rd_lib_crypto} ${3rd_liblz4} -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libcbb} -Wl,--no-whole-archive)
+target_link_libraries(dcc_ctl utils dcc_driver pthread dl rt ${HIDDEN_LIBS} ${3rd_libzstd} ${3rd_libssl} ${3rd_lib_crypto} ${3rd_liblz4} -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libcbb} ${3rd_libz} -Wl,--no-whole-archive)
 set_target_properties(dcc_ctl PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 set_target_properties(dcc_ctl PROPERTIES LINKER_LANGUAGE "C")
\ No newline at end of file
diff --git a/src/tools/dcc_encrypt/CMakeLists.txt b/src/tools/dcc_encrypt/CMakeLists.txt
index 5e8db54..2ebab40 100644
--- a/src/tools/dcc_encrypt/CMakeLists.txt
+++ b/src/tools/dcc_encrypt/CMakeLists.txt
@@ -16,6 +16,6 @@ aux_source_directory(${DCC_ENCRYPT_PATH} ENCRYPT_SRC)
 # output client bin
 set(ENCRYPT_SRC_LIST  ${ENCRYPT_SRC})
 add_executable(dcc_encrypt ${ENCRYPT_SRC_LIST})
-target_link_libraries(dcc_encrypt pthread dl rt ${3rd_libssl} ${3rd_lib_crypto} ${HIDDEN_LIBS} -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libcbb} -Wl,--no-whole-archive)
+target_link_libraries(dcc_encrypt pthread dl rt ${3rd_libssl} ${3rd_lib_crypto} ${HIDDEN_LIBS} -Wl,--whole-archive ${vpp_libsecurec} ${3rd_libcbb} ${3rd_libz} -Wl,--no-whole-archive)
 set_target_properties(dcc_encrypt PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 set_target_properties(dcc_encrypt PROPERTIES LINKER_LANGUAGE "C")
\ No newline at end of file
diff --git a/test/test_main/CMakeLists.txt b/test/test_main/CMakeLists.txt
index c58b359..3cd335c 100644
--- a/test/test_main/CMakeLists.txt
+++ b/test/test_main/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.14.1)
 message(STATUS "dcc_main current_dir=${CMAKE_CURRENT_SOURCE_DIR}")
+set(CMAKE_C_FLAGS "-g -D_FILE_NAME_='\"$(notdir $(subst .o,,$(abspath $@)))\"'")
+set(CMAKE_CXX_FLAGS "-g -D_FILE_NAME_='\"$(notdir $(subst .o,,$(abspath $@)))\"'")
 
 # include third party
 include_directories(${DCC_SECUREC_INC_PATH})
@@ -27,7 +29,7 @@ link_directories(${DCC_GSTORE_LIB_PATH})
 link_directories(${LIBRARY_OUTPUT_PATH})
 
 add_executable(dcc_main test_main.cpp)
-target_link_libraries(dcc_main pthread dl dcc dcc_driver gstor dcf -Wl,--whole-archive ${3rd_lib_crypto} ${3rd_liblz4} ${3rd_libjson} ${3rd_libzstd} ${vpp_libsecurec} ${3rd_libcbb} ${3rd_libssl} -Wl,--no-whole-archive)
+target_link_libraries(dcc_main pthread dl dcc dcc_driver gstor dcf -Wl,--whole-archive ${3rd_lib_crypto} ${3rd_liblz4} ${3rd_libjson} ${3rd_libzstd} ${vpp_libsecurec} ${3rd_libcbb} ${3rd_libssl} ${3rd_libz} -Wl,--no-whole-archive)
 target_compile_options(dcc_main PRIVATE -std=c++11)
 
 set_target_properties(dcc_main
-- 
Gitee