xml2: use xml2 from github instead of gnome
This commit is contained in:
parent
625f338d77
commit
4eb3563d6d
|
@ -123,7 +123,6 @@ contrib/*
|
|||
!contrib/CMakeLists.txt
|
||||
!contrib/test
|
||||
!contrib/azure-cmake
|
||||
!contrib/xml2-cmake
|
||||
sql
|
||||
debug*/
|
||||
.env
|
||||
|
@ -157,6 +156,9 @@ pcre2_grep_test.sh
|
|||
pcre2_chartables.c
|
||||
geos-config
|
||||
config.h
|
||||
!contrib/xml2-cmake
|
||||
!contrib/xml2-cmake/linux_x86_64/include/config.h
|
||||
!contrib/xml2-cmake/CMakeLists.txt
|
||||
pcre2.h
|
||||
zconf.h
|
||||
version.h
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
ExternalProject_Add(azure
|
||||
URL https://github.com/Azure/azure-sdk-for-cpp/archive/refs/tags/azure-storage-blobs_12.13.0-beta.1.tar.gz
|
||||
URL_HASH SHA256=3eca486fd60e3522d0a633025ecd652a71515b1e944799b2e8ee31fd590305a9
|
||||
DEPENDS xml2
|
||||
DOWNLOAD_NO_PROGRESS 1
|
||||
DOWNLOAD_DIR "${TD_CONTRIB_DIR}/deps-download"
|
||||
SOURCE_DIR "${TD_CONTRIB_DIR}/azure-sdk-for-cpp-azure-storage-blobs_12.13.0-beta.1"
|
||||
|
|
|
@ -652,7 +652,12 @@ if(${BUILD_PCRE2})
|
|||
endif(${BUILD_PCRE2})
|
||||
|
||||
if(${TD_LINUX} AND ${BUILD_WITH_S3})
|
||||
add_subdirectory(azure-cmake EXCLUDE_FROM_ALL)
|
||||
set(ORIG_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
|
||||
string(REPLACE " -Werror " " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
|
||||
add_subdirectory(xml2-cmake)
|
||||
set(CMAKE_C_FLAGS ${ORIG_CMAKE_C_FLAGS})
|
||||
|
||||
add_subdirectory(azure-cmake)
|
||||
endif()
|
||||
|
||||
IF(TD_LINUX)
|
||||
|
|
|
@ -36,10 +36,6 @@ target_include_directories(
|
|||
)
|
||||
|
||||
find_library(CURL_LIBRARY curl $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
|
||||
find_library(XML2_LIBRARY xml2 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
|
||||
|
||||
# find_library(CURL_LIBRARY curl)
|
||||
# find_library(XML2_LIBRARY xml2)
|
||||
find_library(SSL_LIBRARY ssl $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
|
||||
find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
|
||||
|
||||
|
@ -50,9 +46,8 @@ target_link_libraries(
|
|||
PRIVATE ${CURL_LIBRARY}
|
||||
PRIVATE ${SSL_LIBRARY}
|
||||
PRIVATE ${CRYPTO_LIBRARY}
|
||||
PRIVATE ${XML2_LIBRARY}
|
||||
|
||||
# PRIVATE xml2
|
||||
PRIVATE _libxml2
|
||||
PRIVATE zlib
|
||||
|
||||
# PRIVATE ${CoreFoundation_Library}
|
||||
|
|
|
@ -66,7 +66,6 @@ if(${BUILD_S3})
|
|||
set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.2)
|
||||
find_library(S3_LIBRARY s3)
|
||||
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 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
|
||||
find_library(CRYPTO_LIBRARY crypto $ENV{HOME}/.cos-local.2/lib64 $ENV{HOME}/.cos-local.2/lib NO_DEFAULT_PATH)
|
||||
target_link_libraries(
|
||||
|
@ -77,7 +76,7 @@ if(${BUILD_S3})
|
|||
PUBLIC ${CURL_LIBRARY}
|
||||
PUBLIC ${SSL_LIBRARY}
|
||||
PUBLIC ${CRYPTO_LIBRARY}
|
||||
PUBLIC ${XML2_LIBRARY}
|
||||
PUBLIC _libxml2
|
||||
)
|
||||
|
||||
add_definitions(-DUSE_S3)
|
||||
|
|
Loading…
Reference in New Issue