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

ZEISS · Dec 11, 2023 · 9affb0e · 9affb0e
1 parent aff047d
commit 9affb0e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15)
 cmake_policy(SET CMP0091 NEW) # enable new "MSVC runtime library selection" (https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html)
 
 project(libCZI 
-      VERSION 0.57.0
+      VERSION 0.57.1
       HOMEPAGE_URL "https://github.com/ZEISS/libczi"
       DESCRIPTION "libCZI is an Open Source Cross-Platform C++ library to read and write CZI")
 

diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt
@@ -15,10 +15,14 @@ if (LIBCZI_BUILD_CURL_BASED_STREAM)
   if (LIBCZI_BUILD_PREFER_EXTERNALPACKAGE_LIBCURL)
     find_package(CURL CONFIG QUIET)
     if (NOT CURL_FOUND)
-      message(FATAL_ERROR [=[
-        CURL library was not found, which is required for building. Consider installing it with a package manager, something
-        like 'sudo apt-get install libcurl4-openssl-dev', or disable the option 'LIBCZI_BUILD_PREFER_EXTERNALPACKAGE_LIBCURL'.
-      ]=])
+      message(STATUS "Did not find a package configuration file provided by CURL, will try to locate CURL package by standard search procedure.")
+      find_package(CURL QUIET)
+      if (NOT CURL_FOUND)
+        message(FATAL_ERROR [=[
+          CURL library was not found, which is required for building. Consider installing it with a package manager, something
+          like 'sudo apt-get install libcurl4-openssl-dev', or disable the option 'LIBCZI_BUILD_PREFER_EXTERNALPACKAGE_LIBCURL'.
+        ]=])
+      endif()
     endif()
 
     message(STATUS "Found CURL version: ${CURL_VERSION_STRING}")

diff --git a/Src/libCZI/Doc/version-history.markdown b/Src/libCZI/Doc/version-history.markdown
@@ -12,4 +12,5 @@ version history                 {#version_history}
  0.55.0             | [78](https://github.com/ZEISS/libczi/pull/78)        | optimization: for multi-tile-composition, check relevant tiles for visibility before loading them (and do not load/decode non-visible tiles)
  0.55.1             | [80](https://github.com/ZEISS/libczi/pull/80)        | bugfix for above optimization
  0.56.0             | [82](https://github.com/ZEISS/libczi/pull/82)        | add option "kCurlHttp_CaInfo" & "kCurlHttp_CaInfoBlob", allow to retrieve properties from a stream-class
- 0.57.0             | [84](https://github.com/ZEISS/libczi/pull/84)        | add caching for accessors, update CLI11 to version 2.3.2
+ 0.57.0             | [84](https://github.com/ZEISS/libczi/pull/84)        | add caching for accessors, update CLI11 to version 2.3.2
+ 0.57.1             | [86](https://github.com/ZEISS/libczi/pull/86)        | small improvement for CMake-build: allow to use an apt-provided CURL-package