From 6db88b785b7cf6d1ccd9983299d86c02ee462d4d Mon Sep 17 00:00:00 2001 From: liuheng Date: Sat, 25 Feb 2023 09:58:39 +0800 Subject: [PATCH] =?UTF-8?q?xml=E5=A2=9E=E5=8A=A0=E5=B0=8F=E5=9E=8B?= =?UTF-8?q?=E5=8C=96=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/src/build_options.cmake | 1 + src/gausskernel/CMakeLists.txt | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmake/src/build_options.cmake b/cmake/src/build_options.cmake index 4560cc765..536ccac81 100755 --- a/cmake/src/build_options.cmake +++ b/cmake/src/build_options.cmake @@ -140,6 +140,7 @@ if(${ENABLE_LITE_MODE} STREQUAL "ON") set(ENABLE_LLVM_COMPILE OFF) set(ENABLE_GSS OFF) set(KRB5 OFF) + set(USE_LIBXML OFF) endif() if(${ENABLE_OPENEULER_MAJOR} STREQUAL "ON") diff --git a/src/gausskernel/CMakeLists.txt b/src/gausskernel/CMakeLists.txt index 0003a3263..839f5dc79 100755 --- a/src/gausskernel/CMakeLists.txt +++ b/src/gausskernel/CMakeLists.txt @@ -282,6 +282,13 @@ if(${ENABLE_MEMORY_CHECK}) list(APPEND gaussdb_LINK_LIBS ${MEMCHECK_LIBS}) list(APPEND gaussdb_LINK_DIRS ${MEMCHECK_LINK_DIRECTORIES}) endif() + +if(${USE_LIBXML}) + include_directories(${LIBXML_INCLUDE_PATH}) + list(APPEND gaussdb_LINK_LIBS -lxml2) + list(APPEND gaussdb_LINK_DIRS ${LIBXML_LIB_PATH}) +endif() + if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") list(APPEND gaussdb_LINK_LIBS -lz -lminiunz -leSDKOBS -leSDKLogAPI -lpcre -liconv -lnghttp2 -llog4cpp -lcurl -llz4 -lcjson -l${JEMALLOC_LIB_NAME} -lcgroup -lzstd -lcom_err_gauss -lgssapi_krb5_gauss -lkrb5_gauss -lgssrpc_gauss -lk5crypto_gauss -lkadm5clnt_mit -lkadm5srv_mit -lkdb5 -lkrb5support_gauss -lstdc++ -lboost_thread -lboost_chrono -lboost_system -lboost_atomic -lxml2 -laio -lncurses -ltinfo) else() @@ -319,8 +326,7 @@ include_directories( ) if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") - include_directories( - ${LIBXML_INCLUDE_PATH} + include_directories( ${LIBOBS_INCLUDE_PATH} ${KERBEROS_INCLUDE_PATH} ) @@ -346,7 +352,6 @@ list(APPEND gaussdb_LINK_DIRS if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") list(APPEND gaussdb_LINK_DIRS - ${LIBXML_LIB_PATH} ${LIBOBS_LIB_PATH} ${KERBEROS_LIB_PATH} )