Merge r1925677 from apr/trunk:

Ivan Zhakov · Ivan Zhakov · commit 7babd2502866 · 2025-05-18T16:19:41.000Z
vcpkg: Add LDAP feature. git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.7.x@1925678 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
@@ -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 }}"
diff --git a/build/vcpkg/apr-util/portfile.cmake b/build/vcpkg/apr-util/portfile.cmake
@@ -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
     )
 
diff --git a/build/vcpkg/apr-util/vcpkg.json b/build/vcpkg/apr-util/vcpkg.json
@@ -46,6 +46,9 @@
         }
       ]
     },
+    "ldap": {
+      "description": "LDAP support"
+    },
     "xlate": {
       "description": "Xlate support",
       "dependencies": [

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ if (VCPKG_TARGET_IS_WINDOWS)`
`18`	`18`	`dbd-odbc FEATURE_DBD_ODBC`
`19`	`19`	`dbd-sqlite3 FEATURE_DBD_SQLITE3`
`20`	`20`	`dbd-postgresql FEATURE_DBD_PGQL`
	`21`	`+ ldap FEATURE_LDAP`
`21`	`22`	`)`
`22`	`23`
`23`	`24`	`vcpkg_cmake_configure(`
`@@ -29,6 +30,7 @@ if (VCPKG_TARGET_IS_WINDOWS)`
`29`	`30`	`-DAPU_HAVE_ODBC=${FEATURE_DBD_ODBC}`
`30`	`31`	`-DAPU_HAVE_SQLITE3=${FEATURE_DBD_SQLITE3}`
`31`	`32`	`-DAPU_HAVE_PGSQL=${FEATURE_DBD_PGQL}`
	`33`	`+ -DAPR_HAS_LDAP=${FEATURE_LDAP}`
`32`	`34`	`-DAPU_USE_EXPAT=ON`
`33`	`35`	`)`
`34`	`36`