diff --git a/ports/xqilla/CMakeLists.txt b/ports/xqilla/CMakeLists.txt index d2caaa2230..85ecad2182 100644 --- a/ports/xqilla/CMakeLists.txt +++ b/ports/xqilla/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.21) cmake_policy(VERSION 3.21) -if (XQILLA_STATIC) - add_definitions("-DXQILLA_API=") -else() +if (BUILD_SHARED_LIBS) add_definitions("-DXQILLA_APIS=") +else() + add_definitions("-DXQILLA_API=") endif() 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 "${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 optimized "${XercesC_LIBRARY_RELEASE}") endif() @@ -454,5 +454,4 @@ install( DESTINATION share/unofficial-xqilla FILE unofficial-xqillaConfig.cmake NAMESPACE unofficial::xqilla:: - CONFIGURATIONS Release ) diff --git a/ports/xqilla/portfile.cmake b/ports/xqilla/portfile.cmake index ffc48298c8..c02aa27533 100644 --- a/ports/xqilla/portfile.cmake +++ b/ports/xqilla/portfile.cmake @@ -10,19 +10,14 @@ vcpkg_extract_source_archive_ex( 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}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" NO_CHARSET_FLAG - OPTIONS ${COMPILE_OPTIONS} ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-xqilla) vcpkg_copy_pdbs() diff --git a/ports/xqilla/vcpkg.json b/ports/xqilla/vcpkg.json index 7b7d535aab..5206797d1f 100644 --- a/ports/xqilla/vcpkg.json +++ b/ports/xqilla/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xqilla", "version": "2.3.4", + "port-version": 1, "description": "XQuery and XPath 2 library", "homepage": "http://xqilla.sourceforge.net/HomePage", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index fc5a55e1ff..46ecd7539f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7534,7 +7534,7 @@ }, "xqilla": { "baseline": "2.3.4", - "port-version": 0 + "port-version": 1 }, "xsimd": { "baseline": "8.0.3", diff --git a/versions/x-/xqilla.json b/versions/x-/xqilla.json index 46f07c53b0..edca351477 100644 --- a/versions/x-/xqilla.json +++ b/versions/x-/xqilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "110b08065d892a635f1a8f2dd76f42727788020f", + "version": "2.3.4", + "port-version": 1 + }, { "git-tree": "5e0e7d4ac944e58a70a8a71a8a715598b22c7e73", "version": "2.3.4",