summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHiroshi Miura <miurahr@linux.com>2019-01-18 12:52:42 (GMT)
committerBrad King <brad.king@kitware.com>2019-01-21 12:49:00 (GMT)
commit0526ae4415f61c5a2adfd78e05b797de1d44fba6 (patch)
tree72adba15e903e3fa5c2179818d4dc0581f28a2df
parenta61c061b6143cb6d8920b1b5796a867c0f104556 (diff)
downloadCMake-0526ae4415f61c5a2adfd78e05b797de1d44fba6.zip
CMake-0526ae4415f61c5a2adfd78e05b797de1d44fba6.tar.gz
CMake-0526ae4415f61c5a2adfd78e05b797de1d44fba6.tar.bz2
FindCURL: fix component failure when no pkg-config
find_package(CURL COMPONENTS foo) fails when there is no pkg-config module because of variable name typo. Signed-off-by: Hiroshi Miura <miurahr@linux.com> Fixes: #18802
-rw-r--r--Modules/FindCURL.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake
index d28dfea..b1989b1 100644
--- a/Modules/FindCURL.cmake
+++ b/Modules/FindCURL.cmake
@@ -110,12 +110,12 @@ if(CURL_FIND_COMPONENTS)
OUTPUT_VARIABLE CURL_CONFIG_FEATURES_STRING
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REPLACE "\n" ";" CURL_CONFIG_FEATURES "${CURL_CONFIG_FEATURES_STRING}")
+ string(REPLACE "\n" ";" CURL_SUPPORTED_FEATURES "${CURL_CONFIG_FEATURES_STRING}")
execute_process(COMMAND ${CURL_CONFIG_EXECUTABLE} --protocols
OUTPUT_VARIABLE CURL_CONFIG_PROTOCOLS_STRING
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REPLACE "\n" ";" CURL_CONFIG_PROTOCOLS "${CURL_CONFIG_PROTOCOLS_STRING}")
+ string(REPLACE "\n" ";" CURL_SUPPORTED_PROTOCOLS "${CURL_CONFIG_PROTOCOLS_STRING}")
endif()
endif()