From 0a16d790ce53d777acc577f741b6829b50197f4b Mon Sep 17 00:00:00 2001 From: Jon Shallow Date: Tue, 28 Dec 2021 20:44:31 +0000 Subject: [PATCH] cmake_coap_config.h.in: Fix definitions for when building with tinydtls Build the coap_config.h file in the same way that the make system does without wrapping the definitions with "" --- cmake_coap_config.h.in | 85 +++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/cmake_coap_config.h.in b/cmake_coap_config.h.in index b7c2ed0b..12444227 100644 --- a/cmake_coap_config.h.in +++ b/cmake_coap_config.h.in @@ -2,6 +2,7 @@ * cmake_coap_config.h -- cmake configuration for libcoap * * Copyright (C) 2020 Carlos Gomes Martinho + * Copyright (C) 2021-2022 Jon Shallow * * SPDX-License-Identifier: BSD-2-Clause * @@ -13,13 +14,13 @@ #define COAP_CONFIG_H_ /* Define to 1 if you have header file. */ -#cmakedefine HAVE_WS2TCPIP_H "@HAVE_WS2TCPIP_H@" +#cmakedefine HAVE_WS2TCPIP_H @HAVE_WS2TCPIP_H@ /* Define if the system has small stack size */ -#cmakedefine COAP_CONSTRAINED_STACK "@COAP_CONSTRAINED_STACK@" +#cmakedefine COAP_CONSTRAINED_STACK @COAP_CONSTRAINED_STACK@ /* Define to 1 if you have header file. */ -#cmakedefine HAVE_WINSOCK2_H "@HAVE_WINSOCK2_H@" +#cmakedefine HAVE_WINSOCK2_H @HAVE_WINSOCK2_H@ /* Define if the library has client support */ #cmakedefine COAP_CLIENT_SUPPORT @COAP_CLIENT_SUPPORT@ @@ -28,124 +29,124 @@ #cmakedefine COAP_SERVER_SUPPORT @COAP_SERVER_SUPPORT@ /* Define if the system has epoll support */ -#cmakedefine COAP_EPOLL_SUPPORT "@COAP_EPOLL_SUPPORT@" +#cmakedefine COAP_EPOLL_SUPPORT @COAP_EPOLL_SUPPORT@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_ARPA_INET_H "@HAVE_ARPA_INET_H@" +#cmakedefine HAVE_ARPA_INET_H @HAVE_ARPA_INET_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_ASSERT_H "@HAVE_ASSERT_H@" +#cmakedefine HAVE_ASSERT_H @HAVE_ASSERT_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_DLFCN_H "@HAVE_DLFCN_H@" +#cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@ /* Define to 1 if you have the `getaddrinfo' function. */ -#cmakedefine HAVE_GETADDRINFO "@HAVE_GETADDRINFO@" +#cmakedefine HAVE_GETADDRINFO @HAVE_GETADDRINFO@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_INTTYPES_H "@HAVE_INTTYPES_H@" +#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@ /* Define if the system has openssl */ -#cmakedefine HAVE_OPENSSL "@HAVE_OPENSSL@" +#cmakedefine HAVE_OPENSSL @HAVE_OPENSSL@ /* Define if the system has libgnutls28 */ -#cmakedefine HAVE_LIBGNUTLS "@HAVE_LIBGNUTLS@" +#cmakedefine HAVE_LIBGNUTLS @HAVE_LIBGNUTLS@ /* Define if the system has libtinydtls */ -#cmakedefine HAVE_LIBTINYDTLS "@HAVE_LIBTINYDTLS@" +#cmakedefine HAVE_LIBTINYDTLS @HAVE_LIBTINYDTLS@ /* Define if the system has libmbedtls */ -#cmakedefine HAVE_MBEDTLS "@HAVE_MBEDTLS@" +#cmakedefine HAVE_MBEDTLS @HAVE_MBEDTLS@ /* Define to 1 to build without TCP support. */ #cmakedefine01 COAP_DISABLE_TCP /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_LIMITS_H "@HAVE_LIMITS_H@" +#cmakedefine HAVE_LIMITS_H @HAVE_LIMITS_H@ /* Define to 1 if you have the `malloc' function. */ -#cmakedefine HAVE_MALLOC "@HAVE_MALLOC@" +#cmakedefine HAVE_MALLOC @HAVE_MALLOC@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MEMORY_H "@HAVE_MEMORY_H@" +#cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@ /* Define to 1 if you have the `memset' function. */ -#cmakedefine HAVE_MEMSET "@HAVE_MEMSET@" +#cmakedefine HAVE_MEMSET @HAVE_MEMSET@ /* Define to 1 if you have the `if_nametoindex' function. */ -#cmakedefine HAVE_IF_NAMETOINDEX "@HAVE_IF_NAMETOINDEX@" +#cmakedefine HAVE_IF_NAMETOINDEX @HAVE_IF_NAMETOINDEX@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_NETDB_H "@HAVE_NETDB_H@" +#cmakedefine HAVE_NETDB_H @HAVE_NETDB_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_NET_IF_H "@HAVE_NET_IF_H@" +#cmakedefine HAVE_NET_IF_H @HAVE_NET_IF_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_NETINET_IN_H "@HAVE_NETINET_IN_H@" +#cmakedefine HAVE_NETINET_IN_H @HAVE_NETINET_IN_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_PTHREAD_H "@HAVE_PTHREAD_H@" +#cmakedefine HAVE_PTHREAD_H @HAVE_PTHREAD_H@ /* Define to 1 if you have the `pthread_mutex_lock' function. */ -#cmakedefine HAVE_PTHREAD_MUTEX_LOCK "@HAVE_PTHREAD_MUTEX_LOCK@" +#cmakedefine HAVE_PTHREAD_MUTEX_LOCK @HAVE_PTHREAD_MUTEX_LOCK@ /* Define to 1 if you have the `select' function. */ -#cmakedefine HAVE_SELECT "@HAVE_SELECT@" +#cmakedefine HAVE_SELECT @HAVE_SELECT@ /* Define to 1 if you have the `socket' function. */ -#cmakedefine HAVE_SOCKET "@HAVE_SOCKET@" +#cmakedefine HAVE_SOCKET @HAVE_SOCKET@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDINT_H "@HAVE_STDINT_H@" +#cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDLIB_H "@HAVE_STDLIB_H@" +#cmakedefine HAVE_STDLIB_H @HAVE_STDLIB_H@ /* Define to 1 if you have the `strcasecmp' function. */ -#cmakedefine HAVE_STRCASECMP "@HAVE_STRCASECMP@" +#cmakedefine HAVE_STRCASECMP @HAVE_STRCASECMP@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRINGS_H "@HAVE_STRINGS_H@" +#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRING_H "@HAVE_STRING_H@" +#cmakedefine HAVE_STRING_H @HAVE_STRING_H@ /* Define to 1 if you have the `strnlen' function. */ -#cmakedefine HAVE_STRNLEN "@HAVE_STRNLEN@" +#cmakedefine HAVE_STRNLEN @HAVE_STRNLEN@ /* Define to 1 if you have the `strrchr' function. */ -#cmakedefine HAVE_STRRCHR "@HAVE_STRRCHR@" +#cmakedefine HAVE_STRRCHR @HAVE_STRRCHR@ /* Define to 1 if the system has the type `struct cmsghdr'. */ -#cmakedefine HAVE_STRUCT_CMSGHDR "@HAVE_STRUCT_CMSGHDR@" +#cmakedefine HAVE_STRUCT_CMSGHDR @HAVE_STRUCT_CMSGHDR@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYSLOG_H "@HAVE_SYSLOG_H@" +#cmakedefine HAVE_SYSLOG_H @HAVE_SYSLOG_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_IOCTL_H "@HAVE_SYS_IOCTL_H@" +#cmakedefine HAVE_SYS_IOCTL_H @HAVE_SYS_IOCTL_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_SOCKET_H "@HAVE_SYS_SOCKET_H@" +#cmakedefine HAVE_SYS_SOCKET_H @HAVE_SYS_SOCKET_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_STAT_H "@HAVE_SYS_STAT_H@" +#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TIME_H "@HAVE_SYS_TIME_H@" +#cmakedefine HAVE_SYS_TIME_H @HAVE_SYS_TIME_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TYPES_H "@HAVE_SYS_TYPES_H@" +#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_UNISTD_H "@HAVE_SYS_UNISTD_H@" +#cmakedefine HAVE_SYS_UNISTD_H @HAVE_SYS_UNISTD_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_TIME_H "@HAVE_TIME_H@" +#cmakedefine HAVE_TIME_H @HAVE_TIME_H@ /* Define to 1 if you have the header file. */ -#cmakedefine HAVE_UNISTD_H "@HAVE_UNISTD_H@" +#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@ /* Define to the address where bug reports for this package should be sent. */ #cmakedefine PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"