Przeglądaj źródła

Try to get CMake build running on travis

Dirk Ziegelmeier 7 lat temu
rodzic
commit
22c1c4ec8d

+ 2 - 2
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)

+ 0 - 2
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

+ 0 - 2
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

+ 0 - 2
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

+ 0 - 2
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")

+ 10 - 10
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 .