xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch '3.0' into enh/TD-26641-3.0

This commit is contained in:
kailixu 2023-10-26 10:40:54 +08:00
parent e387abcbd3 209ebbde84
commit bb77015998
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/xml2_CMakeLists.txt.in
View File

@ -1,7 +1,9 @@
# xml2 # xml2
ExternalProject_Add(xml2 ExternalProject_Add(xml2
URL https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.tar.gz URL https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.5.tar.xz
URL_HASH SHA256=3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6
#https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.tar.gz
#GIT_REPOSITORY https://github.com/GNOME/libxml2 #GIT_REPOSITORY https://github.com/GNOME/libxml2
#GIT_TAG v2.11.5 #GIT_TAG v2.11.5
DOWNLOAD_NO_PROGRESS 1 DOWNLOAD_NO_PROGRESS 1
@ -9,7 +11,7 @@ ExternalProject_Add(xml2
SOURCE_DIR "${TD_CONTRIB_DIR}/xml2" SOURCE_DIR "${TD_CONTRIB_DIR}/xml2"
#BINARY_DIR "" #BINARY_DIR ""
BUILD_IN_SOURCE TRUE BUILD_IN_SOURCE TRUE
CONFIGURE_COMMAND ./autogen.sh && ./configure --prefix=$ENV{HOME}/.cos-local.2 --enable-shared=no --enable-static=yes --without-python CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.2 --enable-shared=no --enable-static=yes --without-python --without-lzma
BUILD_COMMAND make -j BUILD_COMMAND make -j
INSTALL_COMMAND make install && ln -s $ENV{HOME}/.cos-local.2/include/libxml2/libxml $ENV{HOME}/.cos-local.2/include/libxml INSTALL_COMMAND make install && ln -s $ENV{HOME}/.cos-local.2/include/libxml2/libxml $ENV{HOME}/.cos-local.2/include/libxml
TEST_COMMAND "" TEST_COMMAND ""

5
source/dnode/vnode/CMakeLists.txt
View File

@ -173,7 +173,8 @@ if(${BUILD_WITH_S3})
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.2) set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.2)
find_library(S3_LIBRARY s3) find_library(S3_LIBRARY s3)
find_library(CURL_LIBRARY curl) find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
find_library(XML2_LIBRARY xml2)
find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 NO_DEFAULT_PATH) find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 NO_DEFAULT_PATH)
find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 NO_DEFAULT_PATH) find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 NO_DEFAULT_PATH)
target_link_libraries( target_link_libraries(
@ -184,7 +185,7 @@ if(${BUILD_WITH_S3})
PUBLIC ${CURL_LIBRARY} PUBLIC ${CURL_LIBRARY}
PUBLIC ${SSL_LIBRARY} PUBLIC ${SSL_LIBRARY}
PUBLIC ${CRYPTO_LIBRARY} PUBLIC ${CRYPTO_LIBRARY}
PUBLIC xml2 PUBLIC ${XML2_LIBRARY}
) )
add_definitions(-DUSE_S3) add_definitions(-DUSE_S3)