From 8a4a27e3524941f2d4e405d55cae29f2f6592814 Mon Sep 17 00:00:00 2001
From: Dirk Ziegelmeier <dirk@ziegelmeier.net>
Date: Mon, 30 Apr 2018 22:27:16 +0200
Subject: [PATCH] Adapt win32 port to my latest cmake changes (untested, I
 don't use MS Windows at home)

---
 ports/win32/CMakeLists.txt              | 15 ---------------
 ports/win32/Filelists.cmake             | 25 +++++++++++++++++++++++++
 ports/win32/WindowsCMake/CMakeLists.txt | 11 ++++-------
 3 files changed, 29 insertions(+), 22 deletions(-)
 delete mode 100644 ports/win32/CMakeLists.txt
 create mode 100644 ports/win32/Filelists.cmake

diff --git a/ports/win32/CMakeLists.txt b/ports/win32/CMakeLists.txt
deleted file mode 100644
index dbb9fa9..0000000
--- a/ports/win32/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-set(lwipcontribportwindows_SRCS
-    sys_arch.c
-    sio.c
-    pcapif.c
-    pcapif_helper.c
-)
-
-# pcapif needs WinPcap developer package: https://www.winpcap.org/devel.htm
-set(WPDPACK_DIR ${LWIP_CONTRIB_DIR}/../WpdPack)
-find_library(WPCAP  wpcap  HINTS ${WPDPACK_DIR}/lib)
-find_library(PACKET packet HINTS ${WPDPACK_DIR}/lib)
-include_directories("${WPDPACK_DIR}/include")
-link_libraries(${WPCAP} ${PACKET})
-
-add_library(lwipcontribportwindows EXCLUDE_FROM_ALL ${lwipcontribportwindows_SRCS})
diff --git a/ports/win32/Filelists.cmake b/ports/win32/Filelists.cmake
new file mode 100644
index 0000000..be2d02d
--- /dev/null
+++ b/ports/win32/Filelists.cmake
@@ -0,0 +1,25 @@
+# This file is indended to be included in end-user CMakeLists.txt
+# include(/path/to/Filelists.cmake)
+# It assumes the variable LWIP_CONTRIB_DIR is defined pointing to the
+# root path of lwIP contrib sources.
+#
+# 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(lwipcontribportwindows_SRCS
+    ${LWIP_CONTRIB_DIR}/ports/win32/sys_arch.c
+    ${LWIP_CONTRIB_DIR}/ports/win32/sio.c
+    ${LWIP_CONTRIB_DIR}/ports/win32/pcapif.c
+    ${LWIP_CONTRIB_DIR}/ports/win32/pcapif_helper.c
+)
+
+# pcapif needs WinPcap developer package: https://www.winpcap.org/devel.htm
+set(WPDPACK_DIR ${LWIP_CONTRIB_DIR}/../WpdPack)
+find_library(WPCAP  wpcap  HINTS ${WPDPACK_DIR}/lib)
+find_library(PACKET packet HINTS ${WPDPACK_DIR}/lib)
+include_directories("${WPDPACK_DIR}/include")
+link_libraries(${WPCAP} ${PACKET})
+
+add_library(lwipcontribportwindows EXCLUDE_FROM_ALL ${lwipcontribportwindows_SRCS})
diff --git a/ports/win32/WindowsCMake/CMakeLists.txt b/ports/win32/WindowsCMake/CMakeLists.txt
index 913e068..c45e5f1 100644
--- a/ports/win32/WindowsCMake/CMakeLists.txt
+++ b/ports/win32/WindowsCMake/CMakeLists.txt
@@ -6,6 +6,9 @@ set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 set(LWIP_DIR         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../lwip)
 
 include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake)
+include(${LWIP_DIR}/src/Filelists.cmake)
+include(${LWIP_CONTRIB_DIR}/Filelists.cmake)
+include(${LWIP_CONTRIB_DIR}/ports/win32/Filelists.cmake)
 
 add_definitions(-DLWIP_DEBUG)
 
@@ -16,11 +19,5 @@ include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/"
 )
 
-add_subdirectory(../ win32port)
-link_libraries(lwipcontribportwindows)
-
-add_subdirectory(${LWIP_CONTRIB_DIR}/../lwip/src lwip)
-add_subdirectory(${LWIP_CONTRIB_DIR}/ contrib)
-
 add_executable(lwiptest ../test.c)
-target_link_libraries(lwiptest lwipcontribexamples lwipcontribapps lwipcontribaddons lwipcore lwipapps)
+target_link_libraries(lwiptest lwipcontribexamples lwipcontribapps lwipcontribaddons lwipcore lwipallapps lwipcontribportwindows)