[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 144/163: CMake: Remove unused 'output_var' from 'co
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 144/163: CMake: Remove unused 'output_var' from 'collect_true' |
Date: |
Sun, 05 Aug 2018 12:37:50 +0200 |
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
- [GNUnet-SVN] [gnurl] 93/163: GOVERNANCE.md: explains how this project is run, (continued)
- [GNUnet-SVN] [gnurl] 93/163: GOVERNANCE.md: explains how this project is run, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 101/163: curl-confopts.m4: fix typo from ed224f23d5beb, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 153/163: lib/curl_setup.h: remove unicode bom from 8272ec50f02, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 134/163: DEPRECATE: mention the PR that disabled axTLS, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 133/163: docs/DEPRECATE.md: spelling and minor formatting, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 143/163: CMake: Remove unused functions, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 154/163: lib/curl_setup.h: remove unicode character, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 157/163: TODO: Configurable loading of OpenSSL configuration file, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 114/163: CURLOPT_SSL_VERIFYPEER.3: fix syntax mistake, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 117/163: url: check Curl_conncache_add_conn return code, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 144/163: CMake: Remove unused 'output_var' from 'collect_true',
gnunet <=
- [GNUnet-SVN] [gnurl] 129/163: openssl: Remove some dead code, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 150/163: schannel: make more cipher options conditional, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 162/163: gnurl: rename CURLINFO and CURLOPT section 3 manpages post-merge, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 124/163: travis: add a build using the synchronous name resolver, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 138/163: example/crawler.c: simple crawler based on libxml2, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 132/163: DEPRECATE: new doc describing planned item removals, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 135/163: DEPRECATE: linkified, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 77/163: boringssl + schannel: undef X509_NAME in lib/schannel.h, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 121/163: easy_perform: use *multi_timeout() to get wait times, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 81/163: cppcheck: fix warnings, gnunet, 2018/08/05