cmake: tidy-up continues

- move variable dump to a GHA foldable group.
- minimize scope for an include().
- rename `HIDES_CURL_PRIVATE_SYMBOLS` to `CURL_HIDES_PRIVATE_SYMBOLS`,
  to keep it in the curl namespace.
- drop quotes from a version number.
- add missing `Makefile.inc` var refs to comment.
- FindNGTCP2: rename internal var to underscore/lowercase.
- FindBearSSL, FindGSS: whitespace.

Closes #14571

diff --git a/CMake/CurlSymbolHiding.cmake b/CMake/CurlSymbolHiding.cmake
index cda552a15e1ab46797f934054b4d5eabae35fe2c..3fcc4ba5433ff06caaabd0a2ab95f57305c38efe 100644 (file)
--- a/CMake/CurlSymbolHiding.cmake
+++ b/CMake/CurlSymbolHiding.cmake
@@ -68,12 +68,12 @@ if(CURL_HIDDEN_SYMBOLS)
     set(_supports_symbol_hiding TRUE)
   endif()
 
-  set(HIDES_CURL_PRIVATE_SYMBOLS ${_supports_symbol_hiding})
+  set(CURL_HIDES_PRIVATE_SYMBOLS ${_supports_symbol_hiding})
 else()
   if(MSVC)
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
   endif()
-  set(HIDES_CURL_PRIVATE_SYMBOLS FALSE)
+  set(CURL_HIDES_PRIVATE_SYMBOLS FALSE)
 endif()
 
 set(CURL_CFLAG_SYMBOLS_HIDE ${_cflag_symbols_hide})

diff --git a/CMake/FindBearSSL.cmake b/CMake/FindBearSSL.cmake
index 1d8fbce10132171dd8d8c57198e62e0f582042fb..4dd3817c89532e8a443067a4314a0ff7689e459d 100644 (file)
--- a/CMake/FindBearSSL.cmake
+++ b/CMake/FindBearSSL.cmake
@@ -36,7 +36,6 @@ if(DEFINED BEARSSL_INCLUDE_DIRS AND NOT DEFINED BEARSSL_INCLUDE_DIR)
 endif()
 
 find_path(BEARSSL_INCLUDE_DIR "bearssl.h")
-
 find_library(BEARSSL_LIBRARY "bearssl")
 
 include(FindPackageHandleStandardArgs)

diff --git a/CMake/FindGSS.cmake b/CMake/FindGSS.cmake
index 3b528eaa01ce2fecdc426e28ff90dfcfc1b1bbea..3e37a1d41b3d20de74bb1a7833e429dacab90c60 100644 (file)
--- a/CMake/FindGSS.cmake
+++ b/CMake/FindGSS.cmake
@@ -298,7 +298,8 @@ endif()
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(GSS
   REQUIRED_VARS
-    GSS_LIBRARIES GSS_FLAVOUR
+    GSS_LIBRARIES
+    GSS_FLAVOUR
   VERSION_VAR
     GSS_VERSION
   FAIL_MESSAGE

diff --git a/CMake/FindNGTCP2.cmake b/CMake/FindNGTCP2.cmake
index a51b1c2d3338578d9a0ae8f8f3d3e938cd7ebb74..dfc6008aab9b809c9405ba8cab14cf37fbb4b200 100644 (file)
--- a/CMake/FindNGTCP2.cmake
+++ b/CMake/FindNGTCP2.cmake
@@ -67,18 +67,18 @@ elseif(NGTCP2_INCLUDE_DIR AND EXISTS "${NGTCP2_INCLUDE_DIR}/ngtcp2/version.h")
 endif()
 
 if(NGTCP2_FIND_COMPONENTS)
-  set(NGTCP2_CRYPTO_BACKEND "")
+  set(_ngtcp2_crypto_backend "")
   foreach(_component IN LISTS NGTCP2_FIND_COMPONENTS)
     if(_component MATCHES "^(BoringSSL|quictls|wolfSSL|GnuTLS)")
-      if(NGTCP2_CRYPTO_BACKEND)
+      if(_ngtcp2_crypto_backend)
         message(FATAL_ERROR "NGTCP2: Only one crypto library can be selected")
       endif()
-      set(NGTCP2_CRYPTO_BACKEND ${_component})
+      set(_ngtcp2_crypto_backend ${_component})
     endif()
   endforeach()
 
-  if(NGTCP2_CRYPTO_BACKEND)
-    string(TOLOWER "ngtcp2_crypto_${NGTCP2_CRYPTO_BACKEND}" _crypto_library)
+  if(_ngtcp2_crypto_backend)
+    string(TOLOWER "ngtcp2_crypto_${_ngtcp2_crypto_backend}" _crypto_library)
     if(CURL_USE_PKGCONFIG)
       pkg_check_modules(PC_${_crypto_library} "lib${_crypto_library}")
     endif()
@@ -88,7 +88,7 @@ if(NGTCP2_FIND_COMPONENTS)
         ${PC_${_crypto_library}_LIBRARY_DIRS}
     )
     if(${_crypto_library}_LIBRARY)
-      set(NGTCP2_${NGTCP2_CRYPTO_BACKEND}_FOUND TRUE)
+      set(NGTCP2_${_ngtcp2_crypto_backend}_FOUND TRUE)
       set(NGTCP2_CRYPTO_LIBRARY ${${_crypto_library}_LIBRARY})
     endif()
   endif()

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec91607965c79814b4b58f185c567bfd32777d42..b8a42a5f8eb0eba3adc2ca5ff32a6273ade16bff 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,10 +86,12 @@ message(STATUS "CMake platform flags:${_flags}")
 set(_flags)
 
 function(curl_dumpvars)  # Dump all defined variables with their values
+  message("::group::CMake Variable Dump")
   get_cmake_property(_vars VARIABLES)
   foreach(_var ${_vars})
     message("${_var} = ${${_var}}")
   endforeach()
+  message("::endgroup::")
 endfunction()
 
 file(STRINGS ${CURL_SOURCE_DIR}/include/curl/curlver.h _curl_version_h_contents REGEX "#define LIBCURL_VERSION( |_NUM )")
@@ -686,7 +688,7 @@ option(CURL_ZSTD "Set to ON to enable building curl with zstd support." OFF)
 set(HAVE_ZSTD OFF)
 if(CURL_ZSTD)
   find_package(Zstd REQUIRED)
-  if(Zstd_FOUND AND NOT Zstd_VERSION VERSION_LESS "1.0.0")
+  if(Zstd_FOUND AND NOT Zstd_VERSION VERSION_LESS 1.0.0)
     set(HAVE_ZSTD ON)
     list(APPEND CURL_LIBS ${Zstd_LIBRARIES})
     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libzstd")
@@ -1236,10 +1238,10 @@ endif()
 
 option(ENABLE_UNIX_SOCKETS "Define if you want Unix domain sockets support" ON)
 if(ENABLE_UNIX_SOCKETS)
-  include(CheckStructHasMember)
   if(WIN32)
     set(USE_UNIX_SOCKETS ON)
   else()
+    include(CheckStructHasMember)
     check_struct_has_member("struct sockaddr_un" "sun_path" "sys/un.h" USE_UNIX_SOCKETS)
   endif()
 else()

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 52324ba296f6f1e29bd04649c55fff2cea246e33..bcaa69cc910ec9c61f18ad05e170834c3c7126e3 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -101,7 +101,7 @@ if(SHARE_LIB_OBJECT)
   target_link_libraries(${LIB_OBJECT} PRIVATE ${CURL_LIBS})
   set_target_properties(${LIB_OBJECT} PROPERTIES
     POSITION_INDEPENDENT_CODE ON)
-  if(HIDES_CURL_PRIVATE_SYMBOLS)
+  if(CURL_HIDES_PRIVATE_SYMBOLS)
     set_property(TARGET ${LIB_OBJECT} APPEND PROPERTY COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}")
     set_property(TARGET ${LIB_OBJECT} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS")
   endif()
@@ -135,7 +135,7 @@ if(BUILD_STATIC_LIBS)
     PREFIX "" OUTPUT_NAME "${LIBCURL_OUTPUT_NAME}"
     SUFFIX "${STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"
     INTERFACE_COMPILE_DEFINITIONS "CURL_STATICLIB")
-  if(HIDES_CURL_PRIVATE_SYMBOLS)
+  if(CURL_HIDES_PRIVATE_SYMBOLS)
     set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}")
     set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS")
   endif()
@@ -165,7 +165,7 @@ if(BUILD_SHARED_LIBS)
   endif()
   if(WIN32)
     set_property(TARGET ${LIB_SHARED} APPEND PROPERTY SOURCES "libcurl.rc")
-    if(HIDES_CURL_PRIVATE_SYMBOLS)
+    if(CURL_HIDES_PRIVATE_SYMBOLS)
       set_property(TARGET ${LIB_SHARED} APPEND PROPERTY SOURCES "${CURL_SOURCE_DIR}/libcurl.def")
     endif()
   endif()
@@ -175,7 +175,7 @@ if(BUILD_SHARED_LIBS)
     PREFIX "" OUTPUT_NAME "${LIBCURL_OUTPUT_NAME}"
     IMPORT_PREFIX "" IMPORT_SUFFIX "${IMPORT_LIB_SUFFIX}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
     POSITION_INDEPENDENT_CODE ON)
-  if(HIDES_CURL_PRIVATE_SYMBOLS)
+  if(CURL_HIDES_PRIVATE_SYMBOLS)
     set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}")
     set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS")
   endif()

diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 8b163684999d3460cb04934e7267f34d6fc1080d..5715bf80556b927db42a19600ae977d1a30402f3 100644 (file)
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -45,7 +45,7 @@ function(setup_test _test_name)  # ARGN are the files in the test
     PROJECT_LABEL "Test ${_test_name}")
 endfunction()
 
-# Get 'noinst_PROGRAMS', '*_SOURCES' variables
+# Get 'noinst_PROGRAMS', '*_SOURCES', WARNLESS, MULTIBYTE, TIMEDIFF variables
 transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
 
@@ -66,7 +66,7 @@ if(NOT WIN32)
   # library at (tests)/libtest/.libs/libhostname.so
   set_target_properties(hostname PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.libs")
-  if(HIDES_CURL_PRIVATE_SYMBOLS)
+  if(CURL_HIDES_PRIVATE_SYMBOLS)
     set_property(TARGET hostname APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS")
     set_property(TARGET hostname APPEND PROPERTY COMPILE_FLAGS ${CURL_CFLAG_SYMBOLS_HIDE})
   endif()