AntonioND/wf-picolibc
1
Fork 0
mirror of https://github.com/AntonioND/wf-picolibc.git synced 2025-06-18 16:45:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: Define _FORMAT_DEFAULT_* instead of FORMAT_DEFAULT_*

Browse Source 
The meson build exposes _FORMAT_DEFAULT_*. Make cmake do the same.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2024-01-05 11:50:02 -08:00
parent 8e6ea55f74
commit fee6a43ec0
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
CMakeLists.txt
View File

@ -395,34 +395,34 @@ if(NOT DEFINED _WANT_IO_PERCENT_B)
option(_WANT_IO_PERCENT_B "Support %b/%B formats in printf/scanf" OFF)
endif()
if(NOT DEFINED FORMAT_DEFAULT_MINIMAL)
set(FORMAT_DEFAULT_MINIMAL ${IO_MINIMAL})
if(NOT DEFINED _FORMAT_DEFAULT_MINIMAL)
set(_FORMAT_DEFAULT_MINIMAL ${IO_MINIMAL})
endif()
if(FORMAT_DEFAULT_MINIMAL)
set(FORMAT_DEFAULT_DOUBLE 0)
set(FORMAT_DEFAULT_FLOAT 0)
set(FORMAT_DEFAULT_INTEGER 0)
set(FORMAT_DEFAULT_LONG_LONG 0)
if(_FORMAT_DEFAULT_MINIMAL)
set(_FORMAT_DEFAULT_DOUBLE 0)
set(_FORMAT_DEFAULT_FLOAT 0)
set(_FORMAT_DEFAULT_INTEGER 0)
set(_FORMAT_DEFAULT_LONG_LONG 0)
endif()
if(NOT DEFINED FORMAT_DEFAULT_DOUBLE)
set(FORMAT_DEFAULT_DOUBLE ${__IO_FLOAT})
if(NOT DEFINED _FORMAT_DEFAULT_DOUBLE)
set(_FORMAT_DEFAULT_DOUBLE ${__IO_FLOAT})
endif()
if(NOT DEFINED FORMAT_DEFAULT_FLOAT)
set(FORMAT_DEFAULT_FLOAT 0)
if(NOT DEFINED _FORMAT_DEFAULT_FLOAT)
set(_FORMAT_DEFAULT_FLOAT 0)
endif()
if(NOT DEFINED FORMAT_DEFAULT_LONG_LONG)
set(FORMAT_DEFAULT_LONG_LONG 0)
if(NOT DEFINED _FORMAT_DEFAULT_LONG_LONG)
set(_FORMAT_DEFAULT_LONG_LONG 0)
endif()
if(NOT DEFINED FORMAT_DEFAULT_INTEGER)
if(NOT DEFINED _FORMAT_DEFAULT_INTEGER)
if (__IO_FLOAT)
set(FORMAT_DEFAULT_INTEGER 0)
set(_FORMAT_DEFAULT_INTEGER 0)
else()
set(FORMAT_DEFAULT_INTEGER 1)
set(_FORMAT_DEFAULT_INTEGER 1)
endif()
endif()

10
picolibc.h.in
View File

@ -404,15 +404,15 @@
#cmakedefine _WANT_IO_POS_ARGS
#cmakedefine FORMAT_DEFAULT_DOUBLE
#cmakedefine _FORMAT_DEFAULT_DOUBLE
#cmakedefine FORMAT_DEFAULT_FLOAT
#cmakedefine _FORMAT_DEFAULT_FLOAT
#cmakedefine FORMAT_DEFAULT_LONG_LONG
#cmakedefine _FORMAT_DEFAULT_LONG_LONG
#cmakedefine FORMAT_DEFAULT_INTEGER
#cmakedefine _FORMAT_DEFAULT_INTEGER
#cmakedefine FORMAT_DEFAULT_MINIMAL
#cmakedefine _FORMAT_DEFAULT_MINIMAL
/* math library sets errno */
#cmakedefine _WANT_MATH_ERRNO

10
zephyr/zephyr.cmake
View File

@ -69,11 +69,11 @@ if(CONFIG_PICOLIBC_USE_MODULE)
picolibc_option_true("_WANT_IO_POS_ARGS" CONFIG_PICOLIBC_IO_POS_ARGS)
picolibc_option_true("_WANT_IO_LONG_DOUBLE" CONFIG_PICOLIBC_IO_LONG_DOUBLE)
picolibc_option_true("_PRINTF_SMALL_ULTOA" CONFIG_PICOLIBC_IO_SMALL_ULTOA)
picolibc_option_true("FORMAT_DEFAULT_DOUBLE" CONFIG_PICOLIBC_IO_FLOAT)
picolibc_option_val("FORMAT_DEFAULT_FLOAT" 0)
picolibc_option_true("FORMAT_DEFAULT_LONG_LONG" CONFIG_PICOLIBC_IO_LONG_LONG)
picolibc_option_true("FORMAT_DEFAULT_INTEGER" CONFIG_PICOLIBC_IO_INTEGER)
picolibc_option_true("FORMAT_DEFAULT_MINIMAL" CONFIG_PICOLIBC_IO_MINIMAL)
picolibc_option_true("_FORMAT_DEFAULT_DOUBLE" CONFIG_PICOLIBC_IO_FLOAT)
picolibc_option_val("_FORMAT_DEFAULT_FLOAT" 0)
picolibc_option_true("_FORMAT_DEFAULT_LONG_LONG" CONFIG_PICOLIBC_IO_LONG_LONG)
picolibc_option_true("_FORMAT_DEFAULT_INTEGER" CONFIG_PICOLIBC_IO_INTEGER)
picolibc_option_true("_FORMAT_DEFAULT_MINIMAL" CONFIG_PICOLIBC_IO_MINIMAL)
picolibc_option_true("_IO_FLOAT_EXACT" CONFIG_PICOLIBC_IO_FLOAT_EXACT)
picolibc_option_true("__HAVE_LOCALE_INFO__" CONFIG_PICOLIBC_LOCALE_INFO)
picolibc_option_true("__HAVE_LOCALE_INFO_EXTENDED__" CONFIG_PICOLIBC_LOCALE_EXTENDED_INFO)