Skip to content

fix spelling for OpenSSL in cmake - #434

Closed
MaikeR-TV wants to merge 1 commit into
scylladb:masterfrom
MaikeR-TV:fix_dependencies_cmake_for_openssl
Closed

fix spelling for OpenSSL in cmake#434
MaikeR-TV wants to merge 1 commit into
scylladb:masterfrom
MaikeR-TV:fix_dependencies_cmake_for_openssl

Conversation

@MaikeR-TV

@MaikeR-TV MaikeR-TV commented Apr 1, 2026

Copy link
Copy Markdown
Contributor

Consistently use the same writing style for cmake module name, as used for the corresponding cmake variables.
Thus the cmake code will also work with generated cmake snippets from conan.

Renaming FindOpenSSL.cmake to FindOPENSSL.cmake accordingly.

Fixes: "Unable to Locate OpenSSL: Third party build step will be performed" when openssl is provided as conan dependency

Pre-review checklist

  • I have split my patch into logically separate commits.
  • All commit messages clearly explain what they change and why.
  • PR description sums up the changes and reasons why they should be introduced.
  • I have implemented Rust unit tests for the features/changes introduced.
  • I have enabled appropriate tests in Makefile in {SCYLLA,CASSANDRA}_(NO_VALGRIND_)TEST_FILTER.
  • I added appropriate Fixes: annotations to PR description.

@dkropachev

Copy link
Copy Markdown
Contributor

@MaikeR-TV , it needs to be fixed in other places too

Consistently use the same writing style for cmake module name, as used for the corresponding cmake variables.
Thus the cmake code will also work with generated cmake snippets from conan.

Rename FindOPENSSL.cmake accordingly.
@MaikeR-TV
MaikeR-TV force-pushed the fix_dependencies_cmake_for_openssl branch from 8a783d1 to de8c953 Compare April 1, 2026 12:28
@MaikeR-TV

Copy link
Copy Markdown
Contributor Author

I've fixed the failure for Linux by renaming the FindOpenSSL.cmake to FindOPENSSL.cmake accordingly.
macOS seemed to be having other issues.

@MaikeR-TV MaikeR-TV changed the title fix spelling for OpenSSL in cmake code fix spelling for OpenSSL in cmake Apr 1, 2026

@dkropachev dkropachev left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it needs to be updated in other places too

@MaikeR-TV

Copy link
Copy Markdown
Contributor Author

it needs to be updated in other places too

You mean mentions of the FindOPENSSL.cmake file here and here?
Or something else I missed?

dkropachev added a commit that referenced this pull request Apr 1, 2026
…package call

Cherry-picked from PR #434 by MaikeR-TV:
- Rename cmake/FindOpenSSL.cmake to cmake/FindOPENSSL.cmake
- Change find_package(OpenSSL) to find_package(OPENSSL) in Dependencies.cmake

Additionally update find_package_handle_standard_args() calls inside
FindOPENSSL.cmake to use OPENSSL (matching the new package name) so
CMake sets the correct OPENSSL_FOUND variable.
@dkropachev

Copy link
Copy Markdown
Contributor

@MaikeR-TV , thanks for bring it up and taking your time to fix it, i will take your changes and have some more on top of them in #435

@dkropachev dkropachev closed this Apr 1, 2026
dkropachev added a commit that referenced this pull request Apr 1, 2026
## Summary
Rename OpenSSL-related CMake variables and module file to follow the
uppercase `OPENSSL_*` naming convention used throughout the build
system.

## Context
All OpenSSL-related CMake variables in the project use the uppercase
`OPENSSL_*` convention (e.g., `OPENSSL_VERSION`, `OPENSSL_INCLUDE_DIR`,
`OPENSSL_LIBRARIES`, `CASS_USE_OPENSSL`). However, a few places used
inconsistent casing:
- The `openssl_name` helper variable used lowercase
- The `FindOpenSSL.cmake` module file and its `find_package(OpenSSL)`
call used mixed-case

Incorporates changes from PR #434 by @MaikeR-TV (file rename +
find_package update), with additional fixes for
`find_package_handle_standard_args` consistency.

## Changes
- Renamed `openssl_name` variable to `OPENSSL_NAME` in
`cmake/Dependencies.cmake` and `cmake/FindOPENSSL.cmake`
- Renamed `cmake/FindOpenSSL.cmake` to `cmake/FindOPENSSL.cmake` (from
PR #434)
- Changed `find_package(OpenSSL)` to `find_package(OPENSSL)` in
`cmake/Dependencies.cmake` (from PR #434)
- Updated all three `find_package_handle_standard_args(OpenSSL ...)`
calls to `find_package_handle_standard_args(OPENSSL ...)` so CMake
correctly sets `OPENSSL_FOUND`

No behavioral changes — all modifications are naming consistency fixes.

## Testing
```bash
# Configure
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release

# Full lint gate
make check
```

Both pass successfully.

## Links
- Incorporates: #434
- Related macOS CI issue (pre-existing, unrelated): #436
@MaikeR-TV
MaikeR-TV deleted the fix_dependencies_cmake_for_openssl branch April 7, 2026 06:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants