gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

CMake: fail on warnings (#1503)

Browse Source 
When building with `CMake` (especially the targets `valkey-cli`,
`valkey-server` and `valkey-benchmark`) it is possible to have a
successful build while having warnings.

This PR fixes this - which is aligned with how the `Makefile` is working
today:
- Enable `-Wall` + `-Werror` for valkey targets
- Fixed warning in valkey-cli:jsonStringOutput method

Signed-off-by: Eran Ifrah <eifrah@amazon.com>
This commit is contained in:
eifrah-aws 2025-01-03 03:44:41 +02:00 committed by GitHub
parent fe72c784b7
commit b3b4bdcda4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/Modules/ValkeySetup.cmake
View File

@ -93,6 +93,9 @@ macro (valkey_build_and_install_bin target sources ld_flags libs link_name)
target_link_libraries(${target} execinfo) target_link_libraries(${target} execinfo)
endif () endif ()
# Enable all warnings + fail on warning
target_compile_options(${target} PRIVATE -Werror -Wall)
# Install cli tool and create a redis symbolic link # Install cli tool and create a redis symbolic link
valkey_install_bin(${target}) valkey_install_bin(${target})
valkey_create_symlink(${target} ${link_name}) valkey_create_symlink(${target} ${link_name})

2
src/valkey-cli.c
View File

@ -2040,6 +2040,8 @@ static sds jsonStringOutput(sds out, const char *p, int len, int mode) {
} else { } else {
assert(0); assert(0);
} }
/* Silence compiler warning */
return NULL;
} }
static sds cliFormatReplyJson(sds out, redisReply *r, int mode) { static sds cliFormatReplyJson(sds out, redisReply *r, int mode) {