svn commit: r1925678 - in /apr/apr-util/branches/1.7.x: ./ .github/workflows/windows-vcpkg.yml build/vcpkg/apr-util/portfile.cmake build/vcpkg/apr-util/vcpkg.json

Author: ivan
Date: Sun May 18 16:19:41 2025
New Revision: 1925678

URL: http://svn.apache.org/viewvc?rev=1925678&view=rev
Log:
Merge r1925677 from apr/trunk:
  vcpkg: Add LDAP feature.

Modified:
    apr/apr-util/branches/1.7.x/   (props changed)
    apr/apr-util/branches/1.7.x/.github/workflows/windows-vcpkg.yml
    apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/portfile.cmake
    apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/vcpkg.json

Propchange: apr/apr-util/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1925677

Modified: apr/apr-util/branches/1.7.x/.github/workflows/windows-vcpkg.yml
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/.github/workflows/windows-vcpkg.yml?rev=1925678&r1=1925677&r2=1925678&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/.github/workflows/windows-vcpkg.yml (original)
+++ apr/apr-util/branches/1.7.x/.github/workflows/windows-vcpkg.yml Sun May 18 16:19:41 2025
@@ -18,7 +18,7 @@ jobs:
         port:
         - apr-util
         - apr-util[core]
-        - apr-util[crypto,dbd-sqlite3,dbd-odbc,dbd-postgresql,xlate]
+        - apr-util[crypto,dbd-sqlite3,dbd-odbc,dbd-postgresql,ldap,xlate]
       fail-fast: false
     
     name: "${{ matrix.port }}:${{ matrix.triplet }} on ${{ matrix.os }}"

Modified: apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/portfile.cmake
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/portfile.cmake?rev=1925678&r1=1925677&r2=1925678&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/portfile.cmake (original)
+++ apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/portfile.cmake Sun May 18 16:19:41 2025
@@ -18,6 +18,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
             dbd-odbc FEATURE_DBD_ODBC
             dbd-sqlite3 FEATURE_DBD_SQLITE3
             dbd-postgresql FEATURE_DBD_PGQL
+            ldap FEATURE_LDAP
     )
 
     vcpkg_cmake_configure(
@@ -29,6 +30,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
             -DAPU_HAVE_ODBC=${FEATURE_DBD_ODBC}
             -DAPU_HAVE_SQLITE3=${FEATURE_DBD_SQLITE3}
             -DAPU_HAVE_PGSQL=${FEATURE_DBD_PGQL}
+            -DAPR_HAS_LDAP=${FEATURE_LDAP}
             -DAPU_USE_EXPAT=ON
     )
 

Modified: apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/vcpkg.json
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/vcpkg.json?rev=1925678&r1=1925677&r2=1925678&view=diff
==============================================================================
--- apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/vcpkg.json (original)
+++ apr/apr-util/branches/1.7.x/build/vcpkg/apr-util/vcpkg.json Sun May 18 16:19:41 2025
@@ -46,6 +46,9 @@
         }
       ]
     },
+    "ldap": {
+      "description": "LDAP support"
+    },
     "xlate": {
       "description": "Xlate support",
       "dependencies": [