Cleanups in CMake build files

This commit is contained in:
Dirk Ziegelmeier 2018-04-23 23:30:01 +02:00
parent b60df2df20
commit 4355a23ad2
2 changed files with 55 additions and 39 deletions

View File

@ -38,7 +38,7 @@ PROJECT_NAME = "lwIP"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = "${LWIP_VERSION_STRING_SHORT}"
PROJECT_NUMBER = "${LWIP_VERSION_STRING}"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

View File

@ -5,15 +5,9 @@ set(LWIP_VERSION_REVISION "3")
# LWIP_VERSION_RC is set to LWIP_RC_DEVELOPMENT for Git versions */
set(LWIP_VERSION_RC "LWIP_RC_DEVELOPMENT")
set(LWIP_VERSION_STRING_SHORT
set(LWIP_VERSION_STRING
"${LWIP_VERSION_MAJOR}.${LWIP_VERSION_MINOR}.${LWIP_VERSION_REVISION}"
)
set(LWIP_VERSION_STRING
"${LWIP_VERSION_MAJOR}.${LWIP_VERSION_MINOR}.${LWIP_VERSION_REVISION}.${LWIP_VERSION_RC}"
)
configure_file(include/lwip/init.h.cmake.in
${CMAKE_CURRENT_SOURCE_DIR}/include/lwip/init.h)
# The minimum set of files needed for lwIP.
set(lwipcore_SRCS
@ -233,11 +227,10 @@ option(BUILD_DOCUMENTATION "Build documentation" OFF)
if(BUILD_DOCUMENTATION)
find_package(Doxygen)
if (DOXYGEN_FOUND)
# set input and output files
set(DOXYGEN_IN ../doc/doxygen/lwip.Doxyfile.cmake.in)
set(DOXYGEN_OUT ${CMAKE_CURRENT_SOURCE_DIR}/../doc/doxygen/lwip.Doxyfile)
# request to configure the file
# configure the file (version info)
configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT})
message("Doxygen build started")
@ -250,8 +243,10 @@ if(BUILD_DOCUMENTATION)
else (DOXYGEN_FOUND)
message("Doxygen need to be installed to generate the doxygen documentation")
endif (DOXYGEN_FOUND)
endif()
endif(BUILD_DOCUMENTATION)
option(CONFIGURE_FILES "Generate files configured by CMAKE (usually done by lwIP developers)" OFF)
if(CONFIGURE_FILES)
# Generate Filelists.mk via cmake
function(lwip_gen_filelist_entries var_name filelist_var_name)
foreach(srcfile ${${filelist_var_name}})
@ -282,3 +277,24 @@ lwip_gen_filelist_entries("filelist_mk_MBEDTLSFILES" "lwipmbedtls_SRCS")
configure_file(Filelists.mk.cmake.in
${CMAKE_CURRENT_SOURCE_DIR}/Filelists.mk)
# Generate lwip/init.h (version info)
configure_file(include/lwip/init.h.cmake.in
${CMAKE_CURRENT_SOURCE_DIR}/include/lwip/init.h)
endif(CONFIGURE_FILES)
#add_library(lwip ${lwipnoapps_SRCS} ${lwipallapps_SRCS})
#target_include_directories(lwip PUBLIC
# "include/"
# "${CMAKE_CURRENT_SOURCE_DIR}/../../lwip-contrib"
# "${CMAKE_CURRENT_SOURCE_DIR}/../../lwip-contrib/ports/unix/port/include"
# "${CMAKE_CURRENT_SOURCE_DIR}/../../lwip-contrib/ports/unix/unixsim"
#)
#add_executable(makefsdata ${lwipmakefsdata_SRCS})
#target_include_directories(makefsdata PUBLIC
# "include/"
# "${CMAKE_CURRENT_SOURCE_DIR}/../../lwip-contrib"
# "${CMAKE_CURRENT_SOURCE_DIR}/../../lwip-contrib/ports/unix/port/include"
# "${CMAKE_CURRENT_SOURCE_DIR}/../../lwip-contrib/ports/unix/unixsim"
#)