From f116bc37d13cde8f0c759c99a0e6d7ce92134f7a Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Mon, 30 Apr 2018 22:29:07 +0200 Subject: [PATCH] Cleanups in CMake files --- src/Filelists.cmake | 2 +- src/Filelists.mk.cmake.in | 107 -------------------------------------- test/unit/Filelists.cmake | 37 +++---------- 3 files changed, 9 insertions(+), 137 deletions(-) delete mode 100644 src/Filelists.mk.cmake.in diff --git a/src/Filelists.cmake b/src/Filelists.cmake index 8d875740..19f2648b 100644 --- a/src/Filelists.cmake +++ b/src/Filelists.cmake @@ -3,7 +3,7 @@ # It assumes the variable LWIP_DIR is defined pointing to the # root path of lwIP sources. # -# This file is NOT designed (on purpose) to be included as cmake +# This file is NOT designed (on purpose) to be used as cmake # subdir via add_subdirectory() # The intention is to provide greater flexibility to users to # create their own targets using the *_SRCS variables. diff --git a/src/Filelists.mk.cmake.in b/src/Filelists.mk.cmake.in deleted file mode 100644 index c0432e68..00000000 --- a/src/Filelists.mk.cmake.in +++ /dev/null @@ -1,107 +0,0 @@ -# -# Copyright (c) 2001, 2002 Swedish Institute of Computer Science. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -# SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY -# OF SUCH DAMAGE. -# -# This file is part of the lwIP TCP/IP stack. -# -# Author: Adam Dunkels -# - -LWIP_VERSION_MAJOR=${LWIP_VERSION_MAJOR} -LWIP_VERSION_MINOR=${LWIP_VERSION_MINOR} -LWIP_VERSION_REVISION=${LWIP_VERSION_REVISION} - -# COREFILES: The minimum set of files needed for lwIP. -COREFILES=${filelist_mk_COREFILES} - -CORE4FILES=${filelist_mk_CORE4FILES} - -CORE6FILES=${filelist_mk_CORE6FILES} - -# APIFILES: The files which implement the sequential and socket APIs. -APIFILES=${filelist_mk_APIFILES} - -# NETIFFILES: Files implementing various generic network interface functions -NETIFFILES=${filelist_mk_NETIFFILES} - -# SIXLOWPAN: 6LoWPAN -SIXLOWPAN=${filelist_mk_SIXLOWPANFILES} - -# PPPFILES: PPP -PPPFILES=${filelist_mk_PPPFILES} - -# LWIPNOAPPSFILES: All LWIP files without apps -LWIPNOAPPSFILES=$(COREFILES) \ - $(CORE4FILES) \ - $(CORE6FILES) \ - $(APIFILES) \ - $(NETIFFILES) \ - $(PPPFILES) \ - $(SIXLOWPAN) - -# SNMPFILES: SNMPv3 agent -SNMPFILES=${filelist_mk_SNMPFILES} - -# HTTPFILES: HTTP server + client -HTTPFILES=${filelist_mk_HTTPFILES} - -# MAKEFSDATA: MAKEFSDATA HTTP server host utility -MAKEFSDATAFILES=${filelist_mk_MKFSDATAFILES} - -# LWIPERFFILES: IPERF server -LWIPERFFILES=${filelist_mk_IPERFFILES} - -# SMTPFILES: SMTP client -SMTPFILES=${filelist_mk_SMTPFILES} - -# SNTPFILES: SNTP client -SNTPFILES=${filelist_mk_SNTPFILES} - -# MDNSFILES: MDNS responder -MDNSFILES=${filelist_mk_MDNSFILES} - -# NETBIOSNSFILES: NetBIOS name server -NETBIOSNSFILES=${filelist_mk_NETBIOSFILES} - -# TFTPFILES: TFTP server files -TFTPFILES=${filelist_mk_TFTPFILES} - -# MQTTFILES: MQTT client files -MQTTFILES=${filelist_mk_MQTTFILES} - -# MBEDTLS_FILES: MBEDTLS related files of lwIP rep -MBEDTLS_FILES=${filelist_mk_MBEDTLSFILES} - -# LWIPAPPFILES: All LWIP APPs -LWIPAPPFILES=$(SNMPFILES) \ - $(HTTPFILES) \ - $(LWIPERFFILES) \ - $(SMTPFILES) \ - $(SNTPFILES) \ - $(MDNSFILES) \ - $(NETBIOSNSFILES) \ - $(TFTPFILES) \ - $(MQTTFILES) \ - $(MBEDTLS_FILES) diff --git a/test/unit/Filelists.cmake b/test/unit/Filelists.cmake index e1cabab3..a1eb123e 100644 --- a/test/unit/Filelists.cmake +++ b/test/unit/Filelists.cmake @@ -1,33 +1,12 @@ +# This file is indended to be included in end-user CMakeLists.txt +# include(/path/to/Filelists.cmake) +# It assumes the variable LWIP_DIR is defined pointing to the +# root path of lwIP sources. # -# Copyright (c) 2001, 2002 Swedish Institute of Computer Science. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -# SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY -# OF SUCH DAMAGE. -# -# This file is part of the lwIP TCP/IP stack. -# -# Author: Adam Dunkels -# +# This file is NOT designed (on purpose) to be used as cmake +# subdir via add_subdirectory() +# The intention is to provide greater flexibility to users to +# create their own targets using the *_SRCS variables. set(LWIP_TESTDIR ${LWIP_DIR}/test/unit) set(LWIP_TESTFILES