summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-21 12:50:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-01-21 12:50:23 (GMT)
commit15fe5c4c9d90aa03e146fe8b9585e82c4f3b5ffe (patch)
tree85f8b0a506d2f4cf1a81055c4f01707073a1b6ff /Modules
parentd704cc34071f0c6f95099670c94c7f1940ab7fa2 (diff)
parent0526ae4415f61c5a2adfd78e05b797de1d44fba6 (diff)
downloadCMake-15fe5c4c9d90aa03e146fe8b9585e82c4f3b5ffe.zip
CMake-15fe5c4c9d90aa03e146fe8b9585e82c4f3b5ffe.tar.gz
CMake-15fe5c4c9d90aa03e146fe8b9585e82c4f3b5ffe.tar.bz2
Merge topic 'FindCURL-typo'
0526ae4415 FindCURL: fix component failure when no pkg-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2826
Diffstat (limited to 'Modules')
-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()