Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 8 commits into from
Closed

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

wants to merge 8 commits into from

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Aug 16, 2024 •
edited
Loading

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 added the cmake label Aug 16, 2024
@github-actions github-actions bot added the build label Aug 16, 2024
@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
curl.sh: update ZSTD config variables [ci skip]
68053fd 
curl/curl#14574
curl/curl@9fbda4c
vszakats added a commit that referenced this pull request Aug 17, 2024
@vszakats
cmake: do not unset the deprecated mixed-case variables
24889ac 
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
build cmake
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@vszakats