[xqilla] no absolute paths (#23776)

This commit is contained in:
autoantwort 2022-03-28 22:30:04 +02:00 committed by GitHub
parent 38ea776249
commit fca3a520b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions

View File

@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.21) cmake_minimum_required(VERSION 3.21)
cmake_policy(VERSION 3.21) cmake_policy(VERSION 3.21)
if (XQILLA_STATIC) if (BUILD_SHARED_LIBS)
add_definitions("-DXQILLA_API=")
else()
add_definitions("-DXQILLA_APIS=") add_definitions("-DXQILLA_APIS=")
else()
add_definitions("-DXQILLA_API=")
endif() endif()
project(xqilla C CXX) project(xqilla C CXX)
@ -430,7 +430,7 @@ find_package(XercesC REQUIRED)
target_include_directories(xqilla PRIVATE "${XercesC_INCLUDE_DIRS}") target_include_directories(xqilla PRIVATE "${XercesC_INCLUDE_DIRS}")
target_include_directories(xqilla PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include") target_include_directories(xqilla PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include")
if (NOT XQILLA_STATIC) if (BUILD_SHARED_LIBS)
target_link_libraries(xqilla PUBLIC debug "${XercesC_LIBRARY_DEBUG}") target_link_libraries(xqilla PUBLIC debug "${XercesC_LIBRARY_DEBUG}")
target_link_libraries(xqilla PUBLIC optimized "${XercesC_LIBRARY_RELEASE}") target_link_libraries(xqilla PUBLIC optimized "${XercesC_LIBRARY_RELEASE}")
endif() endif()
@ -454,5 +454,4 @@ install(
DESTINATION share/unofficial-xqilla DESTINATION share/unofficial-xqilla
FILE unofficial-xqillaConfig.cmake FILE unofficial-xqillaConfig.cmake
NAMESPACE unofficial::xqilla:: NAMESPACE unofficial::xqilla::
CONFIGURATIONS Release
) )

View File

@ -10,19 +10,14 @@ vcpkg_extract_source_archive_ex(
PATCHES "fix-compare.patch" PATCHES "fix-compare.patch"
) )
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
list(APPEND COMPILE_OPTIONS "-DXQILLA_STATIC=static")
endif()
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
NO_CHARSET_FLAG NO_CHARSET_FLAG
OPTIONS ${COMPILE_OPTIONS}
) )
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-xqilla)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()

View File

@ -1,6 +1,7 @@
{ {
"name": "xqilla", "name": "xqilla",
"version": "2.3.4", "version": "2.3.4",
"port-version": 1,
"description": "XQuery and XPath 2 library", "description": "XQuery and XPath 2 library",
"homepage": "http://xqilla.sourceforge.net/HomePage", "homepage": "http://xqilla.sourceforge.net/HomePage",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@ -7534,7 +7534,7 @@
}, },
"xqilla": { "xqilla": {
"baseline": "2.3.4", "baseline": "2.3.4",
"port-version": 0 "port-version": 1
}, },
"xsimd": { "xsimd": {
"baseline": "8.0.3", "baseline": "8.0.3",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "110b08065d892a635f1a8f2dd76f42727788020f",
"version": "2.3.4",
"port-version": 1
},
{ {
"git-tree": "5e0e7d4ac944e58a70a8a71a8a715598b22c7e73", "git-tree": "5e0e7d4ac944e58a70a8a71a8a715598b22c7e73",
"version": "2.3.4", "version": "2.3.4",