summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-06-30 12:35:47 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-06-30 12:35:55 (GMT)
commit7375542615e0c1d3d09117eac3a9e201275da425 (patch)
tree5b201a9e757f03ccf460ca0dc6fe9496e966da1f
parentac977c52a697bfc13576a222c229606eaedd9154 (diff)
parent886ba0b1d6a57e7f41a3a9dcd3389166333fb837 (diff)
downloadCMake-7375542615e0c1d3d09117eac3a9e201275da425.zip
CMake-7375542615e0c1d3d09117eac3a9e201275da425.tar.gz
CMake-7375542615e0c1d3d09117eac3a9e201275da425.tar.bz2
Merge topic 'FindCURL-package-version'
886ba0b1d6 FindCURL: Set CURL_VERSION_STRING when curl is found as a package Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7421
-rw-r--r--Modules/FindCURL.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake
index e37d225..279e263 100644
--- a/Modules/FindCURL.cmake
+++ b/Modules/FindCURL.cmake
@@ -72,6 +72,8 @@ if(NOT CURL_NO_CURL_CMAKE)
# can print what we found and return.
if(CURL_FOUND)
find_package_handle_standard_args(CURL HANDLE_COMPONENTS CONFIG_MODE)
+ # The upstream curl package sets CURL_VERSION, not CURL_VERSION_STRING.
+ set(CURL_VERSION_STRING "${CURL_VERSION}")
return()
endif()
endif()