diff options
| author | nikita <tek.no.katze@gmail.com> | 2020-04-01 14:27:11 +0200 |
|---|---|---|
| committer | nikita <tek.no.katze@gmail.com> | 2020-04-01 14:27:11 +0200 |
| commit | 10e1f0a795a8d2375eeb30b01c71363fdbcc5895 (patch) | |
| tree | b6c084e5021b8d5c40b6aecd495798d187d2fcd5 /CMake | |
| parent | 69758416170305e04324a85bfe74cd62673e298b (diff) | |
| parent | b81e0b07784dc4c1e8d0a86194b9d28776d071c0 (diff) | |
| download | gnurl-10e1f0a795a8d2375eeb30b01c71363fdbcc5895.tar.gz gnurl-10e1f0a795a8d2375eeb30b01c71363fdbcc5895.tar.bz2 gnurl-10e1f0a795a8d2375eeb30b01c71363fdbcc5895.zip | |
Merge tag 'curl-7_69_1'
7.69.1
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/CurlSymbolHiding.cmake | 8 | ||||
| -rw-r--r-- | CMake/FindNSS.cmake | 4 | ||||
| -rw-r--r-- | CMake/OtherTests.cmake | 4 | ||||
| -rw-r--r-- | CMake/Utilities.cmake | 5 |
4 files changed, 8 insertions, 13 deletions
diff --git a/CMake/CurlSymbolHiding.cmake b/CMake/CurlSymbolHiding.cmake index 224755a31..8e5fd67a0 100644 --- a/CMake/CurlSymbolHiding.cmake +++ b/CMake/CurlSymbolHiding.cmake @@ -11,13 +11,7 @@ if(CURL_HIDDEN_SYMBOLS) set(_SYMBOL_EXTERN "__attribute__ ((__visibility__ (\"default\")))") set(_CFLAG_SYMBOLS_HIDE "-fvisibility=hidden") elseif(CMAKE_COMPILER_IS_GNUCC) - if(NOT CMAKE_VERSION VERSION_LESS 2.8.10) - set(GCC_VERSION ${CMAKE_C_COMPILER_VERSION}) - else() - execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion - OUTPUT_VARIABLE GCC_VERSION) - endif() - if(NOT GCC_VERSION VERSION_LESS 3.4) + if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) # note: this is considered buggy prior to 4.0 but the autotools don't care, so let's ignore that fact set(SUPPORTS_SYMBOL_HIDING TRUE) set(_SYMBOL_EXTERN "__attribute__ ((__visibility__ (\"default\")))") diff --git a/CMake/FindNSS.cmake b/CMake/FindNSS.cmake index 277c7dfb2..0043ce853 100644 --- a/CMake/FindNSS.cmake +++ b/CMake/FindNSS.cmake @@ -10,6 +10,8 @@ set(NSS_LIBRARIES ${PC_NSS_LINK_LIBRARIES}) set(NSS_INCLUDE_DIRS ${PC_NSS_INCLUDE_DIRS}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(NSS DEFAULT_MSG NSS_INCLUDE_DIRS NSS_LIBRARIES) +find_package_handle_standard_args(NSS + REQUIRED_VARS NSS_LIBRARIES NSS_INCLUDE_DIRS + VERSION_VAR PC_NSS_VERSION) mark_as_advanced(NSS_INCLUDE_DIRS NSS_LIBRARIES) diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake index c1c9aa32a..8b150290c 100644 --- a/CMake/OtherTests.cmake +++ b/CMake/OtherTests.cmake @@ -32,7 +32,7 @@ int main(void) { return 0; }" curl_cv_recv) if(curl_cv_recv) - if(NOT DEFINED curl_cv_func_recv_args OR "${curl_cv_func_recv_args}" STREQUAL "unknown") + if(NOT DEFINED curl_cv_func_recv_args OR curl_cv_func_recv_args STREQUAL "unknown") foreach(recv_retv "int" "ssize_t" ) foreach(recv_arg1 "SOCKET" "int" ) foreach(recv_arg2 "char *" "void *" ) @@ -81,7 +81,7 @@ if(curl_cv_recv) string(REGEX REPLACE "^[^,]*,[^,]*,[^,]*,[^,]*,([^,]*)$" "\\1" RECV_TYPE_RETV "${curl_cv_func_recv_args}") endif() - if("${curl_cv_func_recv_args}" STREQUAL "unknown") + if(curl_cv_func_recv_args STREQUAL "unknown") message(FATAL_ERROR "Cannot find proper types to use for recv args") endif() else() diff --git a/CMake/Utilities.cmake b/CMake/Utilities.cmake index 5cb1d4497..ffc411ae9 100644 --- a/CMake/Utilities.cmake +++ b/CMake/Utilities.cmake @@ -2,12 +2,11 @@ # Returns a list of arguments that evaluate to true function(count_true output_count_var) - set(lst) + set(lst_len 0) foreach(option_var IN LISTS ARGN) if(${option_var}) - list(APPEND lst ${option_var}) + math(EXPR lst_len "${lst_len} + 1") endif() endforeach() - list(LENGTH lst lst_len) set(${output_count_var} ${lst_len} PARENT_SCOPE) endfunction() |