3rd-party
/
libfort
1
0
Fork 0
Code Releases Activity

[F] Fixed build for coveralls

This commit is contained in:
seleznevae 2018-04-01 16:01:30 +03:00
parent 2ae836c33a
commit 1d8a3e34b4
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -135,6 +135,7 @@ if(FORT_COMPILER STREQUAL "GNU" OR FORT_COMPILER STREQUAL "Clang")
if(FORT_BUILD_TYPE STREQUAL "coveralls") if(FORT_BUILD_TYPE STREQUAL "coveralls")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fprofile-arcs -ftest-coverage") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fprofile-arcs -ftest-coverage")
set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -g -fprofile-arcs -ftest-coverage") set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -g -fprofile-arcs -ftest-coverage")
target_link_libraries(${PROJECT_NAME}_example_cpp gcov)
endif(FORT_BUILD_TYPE STREQUAL "coveralls") endif(FORT_BUILD_TYPE STREQUAL "coveralls")
endif(FORT_COMPILER STREQUAL "GNU" OR FORT_COMPILER STREQUAL "Clang") endif(FORT_COMPILER STREQUAL "GNU" OR FORT_COMPILER STREQUAL "Clang")

47
include/fort.h
View File

@ -330,7 +330,7 @@ struct ft_border_style {
}; };
/** /**
* Built-in table border styles * Built-in table border styles
*/ */
extern struct ft_border_style *FT_BASIC_STYLE; extern struct ft_border_style *FT_BASIC_STYLE;
extern struct ft_border_style *FT_SIMPLE_STYLE; extern struct ft_border_style *FT_SIMPLE_STYLE;
@ -363,7 +363,7 @@ FT_EXTERN int ft_set_default_border_style(struct ft_border_style *style);
FT_EXTERN int ft_set_border_style(FTABLE *table, struct ft_border_style *style); FT_EXTERN int ft_set_border_style(FTABLE *table, struct ft_border_style *style);
/** /**
* Special macros to define cell position (row and column) * Special macros to define cell position (row and column)
*/ */
#define FT_ANY_COLUMN (UINT_MAX) #define FT_ANY_COLUMN (UINT_MAX)
#define FT_CUR_COLUMN (UINT_MAX - 1) #define FT_CUR_COLUMN (UINT_MAX - 1)
@ -371,7 +371,7 @@ FT_EXTERN int ft_set_border_style(FTABLE *table, struct ft_border_style *style);
#define FT_CUR_ROW (UINT_MAX - 1) #define FT_CUR_ROW (UINT_MAX - 1)
/** /**
* Cell options * Cell options identifiers
*/ */
#define FT_COPT_MIN_WIDTH (0x01U << 0) /**< Minimum width */ #define FT_COPT_MIN_WIDTH (0x01U << 0) /**< Minimum width */
#define FT_COPT_TEXT_ALIGN (0x01U << 1) /**< Text alignmemnt */ #define FT_COPT_TEXT_ALIGN (0x01U << 1) /**< Text alignmemnt */
@ -383,7 +383,7 @@ FT_EXTERN int ft_set_border_style(FTABLE *table, struct ft_border_style *style);
#define FT_COPT_ROW_TYPE (0x01U << 7) /**< Row type */ #define FT_COPT_ROW_TYPE (0x01U << 7) /**< Row type */
/** /**
* Alignment of cell content * Alignment of cell content
*/ */
enum ft_text_alignment { enum ft_text_alignment {
FT_ALIGNED_LEFT, FT_ALIGNED_LEFT,
@ -392,7 +392,7 @@ enum ft_text_alignment {
}; };
/** /**
* Type of table row * Type of table row
*/ */
enum ft_row_type { enum ft_row_type {
FT_ROW_COMMON, FT_ROW_COMMON,
@ -403,9 +403,9 @@ enum ft_row_type {
* Set default cell option for all new formatted tables. * Set default cell option for all new formatted tables.
* *
* @param option * @param option
* Option identifier * Cell option identifier
* @param value * @param value
* Option value * Cell option value
* @return * @return
* - 0: Success; default cell option was changed. * - 0: Success; default cell option was changed.
* - (-1): !!!!!!!! todo * - (-1): !!!!!!!! todo
@ -422,24 +422,49 @@ FT_EXTERN int ft_set_default_cell_option(uint32_t option, int value);
* @param col * @param col
* Cell column * Cell column
* @param option * @param option
* Option identifier * Cell option identifier
* @param value * @param value
* Option value * Cell option value
* @return * @return
* - 0: Success; default cell option was changed. * - 0: Success; cell option was changed.
* - (-1): !!!!!!!! todo * - (-1): !!!!!!!! todo
*/ */
FT_EXTERN int ft_set_cell_option(FTABLE *table, unsigned row, unsigned col, uint32_t option, int value); FT_EXTERN int ft_set_cell_option(FTABLE *table, unsigned row, unsigned col, uint32_t option, int value);
/** /**
* Table options * Table options identifiers
*/ */
#define FT_TOPT_LEFT_MARGIN (0x01U << 0) #define FT_TOPT_LEFT_MARGIN (0x01U << 0)
#define FT_TOPT_TOP_MARGIN (0x01U << 1) #define FT_TOPT_TOP_MARGIN (0x01U << 1)
#define FT_TOPT_RIGHT_MARGIN (0x01U << 2) #define FT_TOPT_RIGHT_MARGIN (0x01U << 2)
#define FT_TOPT_BOTTOM_MARGIN (0x01U << 3) #define FT_TOPT_BOTTOM_MARGIN (0x01U << 3)
/**
* Set default table option.
*
* @param option
* Table option identifier
* @param value
* Table option value
* @return
* - 0: Success; default table option was changed.
* - (-1): !!!!!!!! todo
*/
FT_EXTERN int ft_set_default_tbl_option(uint32_t option, int value); FT_EXTERN int ft_set_default_tbl_option(uint32_t option, int value);
/**
* Set table option.
*
* @param table
* A pointer to the FTABLE structure
* @param option
* Table option identifier
* @param value
* Table option value
* @return
* - 0: Success; default table option was changed.
* - (-1): !!!!!!!! todo
*/
FT_EXTERN int ft_set_tbl_option(FTABLE *table, uint32_t option, int value); FT_EXTERN int ft_set_tbl_option(FTABLE *table, uint32_t option, int value);