ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix formatting of CMake config output

Browse Source 
Type: make
Change-Id: I6e40817609d022cb70887f70aa3608dc759fcd76
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2021-07-16 12:44:22 +02:00
committed by Andrew Yourtchenko
parent 537e955545
commit f2912e02ce
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/CMakeLists.txt
View File

@ -92,7 +92,7 @@ set(CMAKE_C_FLAGS_DEBUG "")
if (${CMAKE_BUILD_TYPE_LC} MATCHES "release") if (${CMAKE_BUILD_TYPE_LC} MATCHES "release")
add_compile_options(-O3 -fstack-protector -fno-common) add_compile_options(-O3 -fstack-protector -fno-common)
add_compile_definitions(_FORTIFY_SOURCE=2) add_compile_definitions(_FORTIFY_SOURCE=2)
string(CONCAT CMAKE_EXE_LINKER_FLAGS_RELEASE "-pie") set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-pie")
elseif (${CMAKE_BUILD_TYPE_LC} MATCHES "debug") elseif (${CMAKE_BUILD_TYPE_LC} MATCHES "debug")
add_compile_options(-O0 -fstack-protector -fno-common) add_compile_options(-O0 -fstack-protector -fno-common)
add_compile_definitions(CLIB_DEBUG) add_compile_definitions(CLIB_DEBUG)
@ -255,14 +255,14 @@ mark_as_advanced(CLEAR
# print configuration # print configuration
############################################################################## ##############################################################################
message(STATUS "Configuration:") message(STATUS "Configuration:")
pr("VPP version" "${VPP_VERSION}") pr("VPP version" ${VPP_VERSION})
pr("VPP library version" "${VPP_LIB_VERSION}") pr("VPP library version" ${VPP_LIB_VERSION})
pr("GIT toplevel dir" "${VPP_GIT_TOPLEVEL_DIR}") pr("GIT toplevel dir" ${VPP_GIT_TOPLEVEL_DIR})
pr("Build type" "${CMAKE_BUILD_TYPE}") pr("Build type" ${CMAKE_BUILD_TYPE})
pr("C flags" "${CMAKE_C_FLAGS}${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UC}}") pr("C flags" ${CMAKE_C_FLAGS}${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UC}})
pr("Linker flags (apps)" "${CMAKE_EXE_LINKER_FLAGS}${CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}}") pr("Linker flags (apps)" ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}})
pr("Linker flags (libs)" "${CMAKE_SHARED_LINKER_FLAGS}${CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}}") pr("Linker flags (libs)" ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}})
pr("Host processor" "${CMAKE_HOST_SYSTEM_PROCESSOR}") pr("Host processor" ${CMAKE_HOST_SYSTEM_PROCESSOR})
pr("Target processor" "${CMAKE_SYSTEM_PROCESSOR}") pr("Target processor" ${CMAKE_SYSTEM_PROCESSOR})
pr("Prefix path" "${CMAKE_PREFIX_PATH}") pr("Prefix path" ${CMAKE_PREFIX_PATH})
pr("Install prefix" "${CMAKE_INSTALL_PREFIX}") pr("Install prefix" ${CMAKE_INSTALL_PREFIX})

4
src/cmake/misc.cmake
View File

@ -39,7 +39,9 @@ endfunction()
############################################################################## ##############################################################################
# aligned config output # aligned config output
############################################################################## ##############################################################################
function(pr desc val) function(pr desc)
# CMake 3.12+: list(JOIN ARGN " " val)
string(REPLACE ";" " " val "${ARGN}")
if("$ENV{TERM}" STREQUAL "xterm-256color") if("$ENV{TERM}" STREQUAL "xterm-256color")
string(ASCII 27 esc) string(ASCII 27 esc)
set(reset "${esc}[m") set(reset "${esc}[m")