Skip to content

cmake: rename wolfSSL and zstd config variables to uppercase - #14574

Closed
vszakats wants to merge 8 commits into
curl:masterfrom
vszakats:cm-find-var-casing
Closed

vszakats wants to merge 8 commits into
curl:masterfrom
vszakats:cm-find-var-casing

Conversation

@vszakats

@vszakats vszakats commented Aug 16, 2024 •

Copy link
Copy Markdown
Member

To match with other config variables and other projects.

Rename these CMake configuration variables:

  • WolfSSL_INCLUDE_DIR -> WOLFSSL_INCLUDE_DIR
  • WolfSSL_LIBRARY -> WOLFSSL_LIBRARY
  • Zstd_INCLUDE_DIR -> ZSTD_INCLUDE_DIR
  • Zstd_LIBRARY -> ZSTD_LIBRARY

The old values continue to work, with a warning suggesting the new name.

Also:

  • add similar warnings for earlier renames for mbedTLS and BearSSL.
  • rename internal variables PC_Zstd_* to uppercase.

Follow-up to db39c66 #14542

@vszakats
vszakats force-pushed the cm-find-var-casing branch from 96860bb to bc4f9d4 Compare August 17, 2024 08:42
@vszakats vszakats closed this in 9fbda4c Aug 17, 2024
@vszakats
vszakats deleted the cm-find-var-casing branch August 17, 2024 19:24
vszakats added a commit to curl/curl-for-win that referenced this pull request Aug 17, 2024
vszakats added a commit that referenced this pull request Aug 17, 2024
To avoid interference with the calling env.

(Keep unsetting for the DIRS/DIR cases in BearSSL and mbedTLS, because
the deprecated variables play a new role in the detection.)

Follow-up to 9fbda4c #14574
vszakats added a commit that referenced this pull request Sep 28, 2026
If you use these variables, replace them like so:
- `MBEDTLS_INCLUDE_DIRS` -> `MBEDTLS_INCLUDE_DIR`
- `WolfSSL_INCLUDE_DIR`  -> `WOLFSSL_INCLUDE_DIR`
- `WolfSSL_LIBRARY`      -> `WOLFSSL_LIBRARY`
- `Zstd_INCLUDE_DIR`     -> `ZSTD_INCLUDE_DIR`
- `Zstd_LIBRARY`         -> `ZSTD_LIBRARY`

They were deprecated two years ago in curl 8.10.0.

Follow-up to 9fbda4c #14574
Follow-up to db39c66 #14542

Closes #23139
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

1 participant