1966c86d71 — curl

Subject

cmake: add and use local FindGnuTLS module

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

CMake/FindGnuTLS.cmake +83 -0 CMakeLists.txt +13 -17 Makefile.am +1 -0 docs/INSTALL-CMAKE.md +2 -0

CMake/FindGnuTLS.cmake+83 -0

@@ -0,0 +1,83 @@
+	#***************************************************************************
+	# _ _ ____ _
+	# Project ___\| \| \| \| _ \\| \|
+	# / __\| \| \| \| \|_) \| \|
+	# \| (__\| \|_\| \| _ <\| \|___
+	# \___\|\___/\|_\| \_\_____\|
+	#
+	# Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+	#
+	# This software is licensed as described in the file COPYING, which
+	# you should have received as part of this distribution. The terms
+	# are also available at https://curl.se/docs/copyright.html.
+	#
+	# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+	# copies of the Software, and permit persons to whom the Software is
+	# furnished to do so, under the terms of the COPYING file.
+	#
+	# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+	# KIND, either express or implied.
+	#
+	# SPDX-License-Identifier: curl
+	#
+	###########################################################################
+	# Find the GnuTLS library
+	#
+	# Input variables:
+	#
+	# - `GNUTLS_INCLUDE_DIR`: The GnuTLS include directory.
+	# - `GNUTLS_LIBRARY`: Path to `gnutls` library.
+	#
+	# Result variables:
+	#
+	# - `GNUTLS_FOUND`: System has GnuTLS.
+	# - `GNUTLS_INCLUDE_DIRS`: The GnuTLS include directories.
+	# - `GNUTLS_LIBRARIES`: The GnuTLS library names.
+	# - `GNUTLS_LIBRARY_DIRS`: The GnuTLS library directories.
+	# - `GNUTLS_PC_REQUIRES`: The GnuTLS pkg-config packages.
+	# - `GNUTLS_CFLAGS`: Required compiler flags.
+	# - `GNUTLS_VERSION`: Version of GnuTLS.
+
+	set(GNUTLS_PC_REQUIRES "gnutls")
+
+	if(CURL_USE_PKGCONFIG AND
+	NOT DEFINED GNUTLS_INCLUDE_DIR AND
+	NOT DEFINED GNUTLS_LIBRARY)
+	find_package(PkgConfig QUIET)
+	pkg_check_modules(GNUTLS ${GNUTLS_PC_REQUIRES})
+	endif()
+
+	if(GNUTLS_FOUND)
+	set(GnuTLS_FOUND TRUE)
+	string(REPLACE ";" " " GNUTLS_CFLAGS "${GNUTLS_CFLAGS}")
+	message(STATUS "Found GnuTLS (via pkg-config): ${GNUTLS_INCLUDE_DIRS} (found version \"${GNUTLS_VERSION}\")")
+	else()
+	find_path(GNUTLS_INCLUDE_DIR NAMES "gnutls/gnutls.h")
+	find_library(GNUTLS_LIBRARY NAMES "gnutls" "libgnutls")
+
+	unset(GNUTLS_VERSION CACHE)
+	if(GNUTLS_INCLUDE_DIR AND EXISTS "${GNUTLS_INCLUDE_DIR}/gnutls/gnutls.h")
+	set(_version_regex "#[\t ]define[\t ]+GNUTLS_VERSION[\t ]+\"([^\"])\"")
+	file(STRINGS "${GNUTLS_INCLUDE_DIR}/gnutls/gnutls.h" _version_str REGEX "${_version_regex}")
+	string(REGEX REPLACE "${_version_regex}" "\\1" _version_str "${_version_str}")
+	set(GNUTLS_VERSION "${_version_str}")
+	unset(_version_regex)
+	unset(_version_str)
+	endif()
+
+	include(FindPackageHandleStandardArgs)
+	find_package_handle_standard_args(GnuTLS
+	REQUIRED_VARS
+	GNUTLS_INCLUDE_DIR
+	GNUTLS_LIBRARY
+	VERSION_VAR
+	GNUTLS_VERSION
+	)
+
+	if(GNUTLS_FOUND)
+	set(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR})
+	set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY})
+	endif()
+
+	mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY)
+	endif()

CMakeLists.txt+13 -17

@@ -890,27 +890,23 @@ if(CURL_USE_WOLFSSL)
	endif()

	if(CURL_USE_GNUTLS)
-	if(CURL_USE_PKGCONFIG)
-	find_package(PkgConfig QUIET)
-	pkg_check_modules(GNUTLS "gnutls")
-	if(GNUTLS_FOUND)
-	set(GNUTLS_LIBRARIES ${GNUTLS_LINK_LIBRARIES})
-	string(REPLACE ";" " " GNUTLS_CFLAGS "${GNUTLS_CFLAGS}")
-	if(GNUTLS_CFLAGS)
-	string(APPEND CMAKE_C_FLAGS " ${GNUTLS_CFLAGS}")
-	endif()
-	endif()
-	endif()
-	if(NOT GNUTLS_FOUND)
-	find_package(GnuTLS REQUIRED)
+	find_package(GnuTLS REQUIRED)
+	list(APPEND CURL_LIBS ${GNUTLS_LIBRARIES})
+	list(APPEND CURL_LIBDIRS ${GNUTLS_LIBRARY_DIRS})
+	list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${GNUTLS_PC_REQUIRES})
+	include_directories(SYSTEM ${GNUTLS_INCLUDE_DIRS})
+	link_directories(${GNUTLS_LIBRARY_DIRS})
+	if(GNUTLS_CFLAGS)
+	string(APPEND CMAKE_C_FLAGS " ${GNUTLS_CFLAGS}")
	endif()
+
	find_package(Nettle REQUIRED)
	set(_ssl_enabled ON)
	set(USE_GNUTLS ON)
-	list(APPEND CURL_LIBS ${GNUTLS_LIBRARIES} ${NETTLE_LIBRARIES})
-	list(APPEND CURL_LIBDIRS ${GNUTLS_LIBRARY_DIRS} ${NETTLE_LIBRARY_DIRS})
-	list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "gnutls" ${NETTLE_PC_REQUIRES})
-	include_directories(SYSTEM ${GNUTLS_INCLUDE_DIRS} ${NETTLE_INCLUDE_DIRS})
+	list(APPEND CURL_LIBS ${NETTLE_LIBRARIES})
+	list(APPEND CURL_LIBDIRS ${NETTLE_LIBRARY_DIRS})
+	list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${NETTLE_PC_REQUIRES})
+	include_directories(SYSTEM ${NETTLE_INCLUDE_DIRS})
	link_directories(${NETTLE_LIBRARY_DIRS})
	if(NETTLE_CFLAGS)
	string(APPEND CMAKE_C_FLAGS " ${NETTLE_CFLAGS}")

Makefile.am+1 -0

@@ -34,6 +34,7 @@ CMAKE_DIST = \
	CMake/CurlTests.c \
	CMake/FindBrotli.cmake \
	CMake/FindCares.cmake \
+	CMake/FindGnuTLS.cmake \
	CMake/FindGSS.cmake \
	CMake/FindLDAP.cmake \
	CMake/FindLibgsasl.cmake \

docs/INSTALL-CMAKE.md+2 -0

@@ -404,6 +404,8 @@ Details via CMake
	- `CARES_INCLUDE_DIR`: The c-ares include directory.
	- `CARES_LIBRARY`: Path to `cares` library.
	- `DL_LIBRARY`: Path to `dl` library. (for Rustls)
+	- `GNUTLS_INCLUDE_DIR`: The GnuTLS include directory.
+	- `GNUTLS_LIBRARY`: Path to `gnutls` library.
	- `GSS_ROOT_DIR`: Set this variable to the root installation of GSS. (also supported as environment)
	- `LDAP_INCLUDE_DIR`: The LDAP include directory.
	- `LDAP_LIBRARY`: Path to `ldap` library.