From 22c1c4ec8d5171e5e36bc1dffd89213c9d8389c2 Mon Sep 17 00:00:00 2001
From: Dirk Ziegelmeier <dirk@ziegelmeier.net>
Date: Sat, 13 Oct 2018 10:45:58 +0200
Subject: [PATCH] Try to get CMake build running on travis

---
 CMakeLists.txt                      |  4 ++--
 contrib/Filelists.cmake             |  2 --
 contrib/ports/unix/Filelists.cmake  |  2 --
 contrib/ports/win32/Filelists.cmake |  2 --
 src/Filelists.cmake                 |  2 --
 travis.sh                           | 20 ++++++++++----------
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ffcfba6..d7df8e7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,8 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL Linux OR ${CMAKE_SYSTEM_NAME} STREQUAL Darw
   add_subdirectory(${LWIP_DIR}/contrib/ports/unix/example_app)
 else()
   message(WARNING "Host ${CMAKE_SYSTEM_NAME} is not supported to build example_app")
-endif()
+  include(src/Filelists.cmake)
+  endif()
 
 # Source package generation
 set(CPACK_SOURCE_GENERATOR "ZIP")
@@ -26,6 +27,5 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "lwip-${LWIP_VERSION_MAJOR}.${LWIP_VERSION_MI
 include(CPack)
 
 # Target for package generation
-include(src/Filelists.cmake)
 add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 add_dependencies(dist lwipdocs)
diff --git a/contrib/Filelists.cmake b/contrib/Filelists.cmake
index f2b31f09..c603026e 100644
--- a/contrib/Filelists.cmake
+++ b/contrib/Filelists.cmake
@@ -12,8 +12,6 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
     include_guard(GLOBAL)
 endif()
 
-include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
-
 set(lwipcontribexamples_SRCS
     ${LWIP_CONTRIB_DIR}/examples/httpd/fs_example/fs_example.c
     ${LWIP_CONTRIB_DIR}/examples/httpd/ssi_example/ssi_example.c
diff --git a/contrib/ports/unix/Filelists.cmake b/contrib/ports/unix/Filelists.cmake
index af68117c..bbdf5079 100644
--- a/contrib/ports/unix/Filelists.cmake
+++ b/contrib/ports/unix/Filelists.cmake
@@ -12,8 +12,6 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
     include_guard(GLOBAL)
 endif()
 
-include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
-
 set(lwipcontribportunix_SRCS
     ${LWIP_CONTRIB_DIR}/ports/unix/port/sys_arch.c
     ${LWIP_CONTRIB_DIR}/ports/unix/port/perf.c
diff --git a/contrib/ports/win32/Filelists.cmake b/contrib/ports/win32/Filelists.cmake
index 48b1e788..7010b431 100644
--- a/contrib/ports/win32/Filelists.cmake
+++ b/contrib/ports/win32/Filelists.cmake
@@ -12,8 +12,6 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
     include_guard(GLOBAL)
 endif()
 
-include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
-
 set(lwipcontribportwindows_SRCS
     ${LWIP_CONTRIB_DIR}/ports/win32/sys_arch.c
     ${LWIP_CONTRIB_DIR}/ports/win32/sio.c
diff --git a/src/Filelists.cmake b/src/Filelists.cmake
index f1bb45f8..803d3f67 100644
--- a/src/Filelists.cmake
+++ b/src/Filelists.cmake
@@ -12,8 +12,6 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
     include_guard(GLOBAL)
 endif()
 
-include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
-
 set(LWIP_VERSION_MAJOR    "2")
 set(LWIP_VERSION_MINOR    "2")
 set(LWIP_VERSION_REVISION "0")
diff --git a/travis.sh b/travis.sh
index 545dbb75..4b1f4253 100755
--- a/travis.sh
+++ b/travis.sh
@@ -10,14 +10,14 @@ if [ $ERR != 0 ]; then
 fi
 make check -j 4
 
-#cd ../../../../
+cd ../../../../
 
-#mkdir build
-#cd build
-#cmake ..
-#ERR=$?
-#if [ $ERR != 0 ]; then
-#       echo "cmake failed"
-#       exit 33
-#fi
-#cmake --build .
+mkdir build
+cd build
+cmake ..
+ERR=$?
+if [ $ERR != 0 ]; then
+       echo "cmake failed"
+       exit 33
+fi
+cmake --build .