[GNUnet-SVN] [gnurl] 144/163: CMake: Remove unused 'output_var' from 'collect_true'

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit b4db3a8a07f6959271a2bfd5a57ee53f7cf823cc
Author: Ruslan Baratov <address@hidden>
AuthorDate: Thu Jul 5 13:21:57 2018 +0300

    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'.
---
 CMake/Utilities.cmake | 11 +++++------
 CMakeLists.txt        |  4 ++--
 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()
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden