зеркало из https://github.com/microsoft/vcpkg.git
[xmlsec] Update version to 1.3.5 (#40286)
Signed-off-by: Raul Metsma <raul@metsma.ee>
This commit is contained in:
Raul Metsma
GitHub
Родитель
ff6594c0ef
Коммит
71ca2a16e7
|
|
@ -5,7 +5,6 @@ option(INSTALL_HEADERS_TOOLS "Install public header files and tools" ON)
|
|||
|
||||
find_package(LibXml2 REQUIRED)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
find_package(Iconv REQUIRED)
|
||||
|
||||
FILE(GLOB SOURCESXMLSEC
|
||||
src/*.c
|
||||
|
|
@ -63,38 +62,28 @@ add_library(xmlsec1-openssl ${SOURCESXMLSECOPENSSL})
|
|||
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include include ${LIBXML2_INCLUDE_DIRS})
|
||||
|
||||
target_link_libraries(xmlsec1 PRIVATE
|
||||
${LIBXML2_LIBRARIES} OpenSSL::SSL
|
||||
)
|
||||
target_link_libraries(xmlsec1 PRIVATE ${LIBXML2_LIBRARIES})
|
||||
target_link_libraries(xmlsec1-openssl PRIVATE
|
||||
${LIBXML2_LIBRARIES} OpenSSL::SSL xmlsec1
|
||||
${LIBXML2_LIBRARIES} OpenSSL::Crypto xmlsec1
|
||||
)
|
||||
|
||||
add_compile_definitions(inline=__inline)
|
||||
add_compile_definitions(PACKAGE="xmlsec1")
|
||||
add_compile_definitions(XMLSEC_MSCRYPTO_NT4=1)
|
||||
add_compile_definitions(HAVE_STDIO_H)
|
||||
add_compile_definitions(HAVE_STDLIB_H)
|
||||
add_compile_definitions(HAVE_STRING_H)
|
||||
add_compile_definitions(HAVE_CTYPE_H)
|
||||
add_compile_definitions(HAVE_MALLOC_H)
|
||||
add_compile_definitions(HAVE_MEMORY_H)
|
||||
add_compile_definitions(XMLSEC_NO_XSLT=1)
|
||||
add_compile_definitions(XMLSEC_DEFAULT_CRYPTO="openssl")
|
||||
add_compile_definitions(XMLSEC_NO_GOST)
|
||||
add_compile_definitions(XMLSEC_NO_GOST2012)
|
||||
add_compile_definitions(XMLSEC_NO_SIZE_T)
|
||||
add_compile_definitions(UNICODE)
|
||||
add_compile_definitions(_UNICODE)
|
||||
add_compile_definitions(_MBCS)
|
||||
add_compile_definitions(_REENTRANT)
|
||||
|
||||
target_compile_definitions(xmlsec1-openssl PRIVATE
|
||||
-DXMLSEC_CRYPTO_OPENSSL
|
||||
)
|
||||
|
||||
set_target_properties(xmlsec1 PROPERTIES VERSION ${XMLSEC_VERSION_MAJOR}.${XMLSEC_VERSION_MINOR})
|
||||
set_target_properties(xmlsec1-openssl PROPERTIES VERSION ${XMLSEC_VERSION_MAJOR}.${XMLSEC_VERSION_MINOR})
|
||||
set_target_properties(xmlsec1 xmlsec1-openssl PROPERTIES VERSION ${XMLSEC_VERSION_MAJOR}.${XMLSEC_VERSION_MINOR})
|
||||
|
||||
if(NOT BUILD_SHARED_LIBS)
|
||||
set(XMLSEC_CORE_CFLAGS "-DLIBXML_STATIC -DLIBXSLT_STATIC -DXMLSEC_STATIC -DXMLSEC_NO_CRYPTO_DYNAMIC_LOADING")
|
||||
|
|
@ -104,7 +93,10 @@ else()
|
|||
set(XMLSEC_OPENSSL_CFLAGS ${XMLSEC_CORE_CFLAGS})
|
||||
endif()
|
||||
|
||||
target_compile_definitions(xmlsec1 PRIVATE ${XMLSEC_CORE_CFLAGS})
|
||||
target_compile_definitions(xmlsec1
|
||||
PRIVATE ${XMLSEC_CORE_CFLAGS}
|
||||
PUBLIC XMLSEC_NO_XSLT XMLSEC_CRYPTO_OPENSSL
|
||||
)
|
||||
target_compile_definitions(xmlsec1-openssl PRIVATE ${XMLSEC_OPENSSL_CFLAGS})
|
||||
|
||||
install(TARGETS xmlsec1 xmlsec1-openssl
|
||||
|
|
@ -148,13 +140,6 @@ if(INSTALL_HEADERS_TOOLS)
|
|||
target_link_libraries(xmlsec PRIVATE
|
||||
${LIBXML2_LIBRARIES} OpenSSL::SSL xmlsec1 xmlsec1-openssl
|
||||
)
|
||||
if(NOT Iconv_IS_BUILT_IN)
|
||||
target_link_libraries(xmlsec PRIVATE Iconv::Iconv)
|
||||
endif()
|
||||
|
||||
target_compile_definitions(xmlsec PRIVATE
|
||||
-DXMLSEC_CRYPTO_OPENSSL
|
||||
)
|
||||
|
||||
if(BUILD_SHARED_LIBS)
|
||||
target_compile_definitions(xmlsec PRIVATE -DXMLSEC_CRYPTO_DYNAMIC_LOADING)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO lsh123/xmlsec
|
||||
REF "${release_tag}"
|
||||
SHA512 32f297fe47c1b79fb8b58dd12ce49aacb408c9361c140567eda6a49e892025fc227efdc7f85c12fe36b79e658e26ee7b0a1fd770bd6ee5b20e4aa5f9fd0e5288
|
||||
SHA512 8574eca37c0be55126e50a76322f96171c9d82dbdd793fdbc26430526488e69db8b41351f136f77bd36f8a3ea238c350bc62dd99214b8348b65dd8055a1c6148
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
pkgconfig_fixes.patch
|
||||
|
|
@ -23,15 +23,6 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-xmlsec)
|
|||
vcpkg_fixup_pkgconfig()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
vcpkg_replace_string(
|
||||
"${CURRENT_PACKAGES_DIR}/include/xmlsec/xmlsec.h"
|
||||
"ifdef XMLSEC_NO_SIZE_T"
|
||||
"if 1 //ifdef XMLSEC_NO_SIZE_T"
|
||||
IGNORE_UNCHANGED
|
||||
)
|
||||
endif()
|
||||
|
||||
# unofficial legacy usage
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/xmlsec-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
{
|
||||
"name": "xmlsec",
|
||||
"version": "1.3.3",
|
||||
"port-version": 1,
|
||||
"version": "1.3.5",
|
||||
"description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.",
|
||||
"homepage": "https://www.aleksey.com/xmlsec/",
|
||||
"license": "X11 AND MPL-1.1",
|
||||
"supports": "!xbox & !uwp",
|
||||
"dependencies": [
|
||||
"libxml2",
|
||||
{
|
||||
"name": "libxml2",
|
||||
"default-features": false
|
||||
},
|
||||
"openssl",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
|
|
|
|||
|
|
@ -9653,8 +9653,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"xmlsec": {
|
||||
"baseline": "1.3.3",
|
||||
"port-version": 1
|
||||
"baseline": "1.3.5",
|
||||
"port-version": 0
|
||||
},
|
||||
"xnnpack": {
|
||||
"baseline": "2022-12-22",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "64b88900914fd5e0330f124cf790e7aaf0a3c052",
|
||||
"version": "1.3.5",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "59572ff53cdf71ec92a8dcd1c4eaa19419ecedf2",
|
||||
"version": "1.3.3",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче