Try to get CMake build running on travis

This commit is contained in:
Dirk Ziegelmeier 2018-10-13 10:45:58 +02:00
parent d03d4c16fb
commit 22c1c4ec8d
6 changed files with 12 additions and 20 deletions

View File

@ -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) add_subdirectory(${LWIP_DIR}/contrib/ports/unix/example_app)
else() else()
message(WARNING "Host ${CMAKE_SYSTEM_NAME} is not supported to build example_app") message(WARNING "Host ${CMAKE_SYSTEM_NAME} is not supported to build example_app")
endif() include(src/Filelists.cmake)
endif()
# Source package generation # Source package generation
set(CPACK_SOURCE_GENERATOR "ZIP") set(CPACK_SOURCE_GENERATOR "ZIP")
@ -26,6 +27,5 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "lwip-${LWIP_VERSION_MAJOR}.${LWIP_VERSION_MI
include(CPack) include(CPack)
# Target for package generation # Target for package generation
include(src/Filelists.cmake)
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
add_dependencies(dist lwipdocs) add_dependencies(dist lwipdocs)

View File

@ -12,8 +12,6 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
include_guard(GLOBAL) include_guard(GLOBAL)
endif() endif()
include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
set(lwipcontribexamples_SRCS set(lwipcontribexamples_SRCS
${LWIP_CONTRIB_DIR}/examples/httpd/fs_example/fs_example.c ${LWIP_CONTRIB_DIR}/examples/httpd/fs_example/fs_example.c
${LWIP_CONTRIB_DIR}/examples/httpd/ssi_example/ssi_example.c ${LWIP_CONTRIB_DIR}/examples/httpd/ssi_example/ssi_example.c

View File

@ -12,8 +12,6 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
include_guard(GLOBAL) include_guard(GLOBAL)
endif() endif()
include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
set(lwipcontribportunix_SRCS set(lwipcontribportunix_SRCS
${LWIP_CONTRIB_DIR}/ports/unix/port/sys_arch.c ${LWIP_CONTRIB_DIR}/ports/unix/port/sys_arch.c
${LWIP_CONTRIB_DIR}/ports/unix/port/perf.c ${LWIP_CONTRIB_DIR}/ports/unix/port/perf.c

View File

@ -12,8 +12,6 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
include_guard(GLOBAL) include_guard(GLOBAL)
endif() endif()
include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
set(lwipcontribportwindows_SRCS set(lwipcontribportwindows_SRCS
${LWIP_CONTRIB_DIR}/ports/win32/sys_arch.c ${LWIP_CONTRIB_DIR}/ports/win32/sys_arch.c
${LWIP_CONTRIB_DIR}/ports/win32/sio.c ${LWIP_CONTRIB_DIR}/ports/win32/sio.c

View File

@ -12,8 +12,6 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
include_guard(GLOBAL) include_guard(GLOBAL)
endif() endif()
include(${LWIP_DIR}/contrib/ports/CMakeCommon.cmake)
set(LWIP_VERSION_MAJOR "2") set(LWIP_VERSION_MAJOR "2")
set(LWIP_VERSION_MINOR "2") set(LWIP_VERSION_MINOR "2")
set(LWIP_VERSION_REVISION "0") set(LWIP_VERSION_REVISION "0")

View File

@ -10,14 +10,14 @@ if [ $ERR != 0 ]; then
fi fi
make check -j 4 make check -j 4
#cd ../../../../ cd ../../../../
#mkdir build mkdir build
#cd build cd build
#cmake .. cmake ..
#ERR=$? ERR=$?
#if [ $ERR != 0 ]; then if [ $ERR != 0 ]; then
# echo "cmake failed" echo "cmake failed"
# exit 33 exit 33
#fi fi
#cmake --build . cmake --build .