From: Viktor Szakats Date: Sat, 1 Feb 2025 11:55:47 +0000 (+0100) Subject: cmake: drop `LDAP_DEPRECATED=1` macro, to sync with autotools X-Git-Tag: curl-8_12_1~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffd6132da602af5b2196852153e1b09d9e14b198;p=thirdparty%2Fcurl.git cmake: drop `LDAP_DEPRECATED=1` macro, to sync with autotools We set this macro to silence a warning inside `openldap.h`. With this warning now silenced by using `-isystem`, we can drop it. Also it never had to be set to `1`. Also enable OpenLDAP in a CMake GHA/macos job. Follow-up to 445fb81237342ff1ec177a61241a53778570526f #14763 Follow-up to 751e168d93b4a58f3fbbe2908c0041ae2f934329 #12024 Closes #16146 --- diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2681313227..dcdede5217 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -147,9 +147,9 @@ jobs: - name: 'wolfSSL !ldap brotli zstd' install: brotli wolfssl zstd generate: -DCURL_USE_WOLFSSL=ON -DCURL_DISABLE_LDAP=ON -DUSE_ECH=ON - - name: 'mbedTLS !ldap brotli zstd' - install: brotli mbedtls zstd - generate: -DCURL_USE_MBEDTLS=ON -DCURL_DISABLE_LDAP=ON + - name: 'mbedTLS openldap brotli zstd' + install: brotli mbedtls zstd openldap + generate: -DCURL_USE_MBEDTLS=ON -DLDAP_INCLUDE_DIR="$(brew --prefix openldap)/include" -DLDAP_LIBRARY="$(brew --prefix openldap)/lib/libldap.dylib" -DLDAP_LBER_LIBRARY="$(brew --prefix openldap)/lib/liblber.dylib" - name: 'GnuTLS !ldap krb5' install: gnutls nettle krb5 generate: -DCURL_USE_GNUTLS=ON -DCURL_USE_OPENSSL=OFF -DCURL_USE_GSSAPI=ON -DGSS_ROOT_DIR=$(brew --prefix krb5) -DCURL_DISABLE_LDAP=ON -DUSE_SSLS_EXPORT=ON diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f7feecfec..810dcbbc6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1209,7 +1209,6 @@ if(NOT CURL_DISABLE_LDAP) if(HAVE_LDAP_INIT_FD) set(USE_OPENLDAP ON) - add_definitions("-DLDAP_DEPRECATED=1") endif() if(NOT CURL_DISABLE_LDAPS) set(HAVE_LDAP_SSL ON)