aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Baratov <ruslan_baratov@yahoo.com>2018-07-05 13:21:57 +0300
committerDaniel Stenberg <daniel@haxx.se>2018-07-06 09:35:28 +0200
commitb4db3a8a07f6959271a2bfd5a57ee53f7cf823cc (patch)
treec6d183c7742dd13dfa3ea42d936be940ea738223
parentfac400da0348a4897f5ee6f54458c09b7ebabf3d (diff)
CMake: Remove unused 'output_var' from 'collect_true'
Variable 'output_var' is not used and can be removed. Function 'collect_true' renamed to 'count_true'.
-rw-r--r--CMake/Utilities.cmake11
-rw-r--r--CMakeLists.txt4
2 files changed, 7 insertions, 8 deletions
diff --git a/CMake/Utilities.cmake b/CMake/Utilities.cmake
index 8425bbd78..5cb1d4497 100644
--- a/CMake/Utilities.cmake
+++ b/CMake/Utilities.cmake
@@ -1,14 +1,13 @@
# File containing various utilities
# Returns a list of arguments that evaluate to true
-function(collect_true output_var output_count_var)
- set(${output_var})
+function(count_true output_count_var)
+ set(lst)
foreach(option_var IN LISTS ARGN)
if(${option_var})
- list(APPEND ${output_var} ${option_var})
+ list(APPEND lst ${option_var})
endif()
endforeach()
- set(${output_var} ${${output_var}} PARENT_SCOPE)
- list(LENGTH ${output_var} ${output_count_var})
- set(${output_count_var} ${${output_count_var}} PARENT_SCOPE)
+ list(LENGTH lst lst_len)
+ set(${output_count_var} ${lst_len} PARENT_SCOPE)
endfunction()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index faa9bddd9..cb6db9333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,13 +309,13 @@ if(WIN32 OR CMAKE_USE_DARWINSSL OR CMAKE_USE_WINSSL OR CMAKE_USE_MBEDTLS)
endif()
option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ${openssl_default})
-collect_true(enabled_ssl_options enabled_ssl_options_count
+count_true(enabled_ssl_options_count
CMAKE_USE_WINSSL
CMAKE_USE_DARWINSSL
CMAKE_USE_OPENSSL
CMAKE_USE_MBEDTLS
)
-if(enabled_ssl_options_count GREATER 1)
+if(enabled_ssl_options_count GREATER "1")
set(CURL_WITH_MULTI_SSL ON)
endif()