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.

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

small adjustment to how a system-provided libCURL is searched for #86

Merged

Conversation

ptahmose
Copy link
Contributor

@ptahmose ptahmose commented Dec 9, 2023

Description

We used find_package(CURL CONFIG QUIET) to pull in an externally provided libcurl-library, which means that CMake is only looking for package configuration files (CURLConfig.cmake or curl-config.cmake file). However, those files are not provided e.g. by Debian's 'libcurl4-openssl-dev'-package. So, we fall back to CMake's standard search procedure if find_package(CURL CONFIG QUIET) fails and try again with find_package(CURL QUIET).
This allows us to use the apt-package without further ado in building libCZI, saving quite some time compared to otherwise having to build libcurl ourselves (with vcpkg or as part of libCZI-build).

I chose to bump the version number here, in order to be able to mention this change in the changelog.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

In a codespace

Checklist:

  • I followed the Contributing Guidelines.
  • I did a self-review.
  • I commented my code, particularly in hard-to-understand areas.
  • I updated the documentation.
  • I updated the version of libCZI following Versioning of libCZI depending on the type of change
    • Bug fix -> PATCH
    • New feature -> MINOR
    • Breaking change -> MAJOR
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes.

@ptahmose ptahmose requested review from a team and DaveyJonesBitPail December 9, 2023 13:15
@ptahmose ptahmose added the cla Contributor License Agreement sent to Admin label Dec 9, 2023
@ptahmose ptahmose marked this pull request as ready for review December 9, 2023 13:17
Copy link

codecov bot commented Dec 9, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (aff047d) 65.38% compared to head (58e6c9c) 65.38%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main      #86   +/-   ##
=======================================
  Coverage   65.38%   65.38%           
=======================================
  Files          83       83           
  Lines       10621    10621           
=======================================
  Hits         6945     6945           
  Misses       3676     3676           
Flag Coverage Δ
windows-latest 65.38% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ptahmose ptahmose mentioned this pull request Dec 9, 2023
11 tasks
@ptahmose ptahmose merged commit 9affb0e into ZEISS:main Dec 11, 2023
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla Contributor License Agreement sent to Admin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants