diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3428cedb..3f7e0dd8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -154,6 +154,11 @@ set(EXTRAWARN "${EXTRAWARN_GCC6} \ ${EXTRAWARN_GCC8} \ ${EXTRAWARN_GCC12} \ ${EXTRAWARN_GCC13}") + +# Remove extra spaces from EXTRAWARN +string(REGEX REPLACE " +" " " EXTRAWARN "${EXTRAWARN}") + +# Separate EXTRAWARN into a list of arguments separate_arguments(EXTRAWARN) # -Wxor-used-as-pow diff --git a/src/lua/CMakeLists.txt b/src/lua/CMakeLists.txt index 1deb1f38..908b5a7e 100644 --- a/src/lua/CMakeLists.txt +++ b/src/lua/CMakeLists.txt @@ -65,7 +65,7 @@ set(sources ) add_library(lua OBJECT ${sources}) -target_compile_options(lua PRIVATE -Wno-maybe-uninitialized) +target_compile_options(lua PRIVATE -Wno-maybe-uninitialized -Wno-unused-variable -Wno-unused-value) # LUA_USE_POSIX: ensures recommended POSIX functions are used instead of # (partially obsoleted) standard C functions diff --git a/src/tre-regex/CMakeLists.txt b/src/tre-regex/CMakeLists.txt index 01d866d8..f4a8ba96 100644 --- a/src/tre-regex/CMakeLists.txt +++ b/src/tre-regex/CMakeLists.txt @@ -27,4 +27,4 @@ set(sources ) add_library(tre-regex OBJECT ${sources}) -target_compile_options(tre-regex PRIVATE -Wno-maybe-uninitialized -Wno-unused-value) +target_compile_options(tre-regex PRIVATE -Wno-maybe-uninitialized -Wno-unused-value -Wno-empty-body) diff --git a/src/webserver/civetweb/CMakeLists.txt b/src/webserver/civetweb/CMakeLists.txt index d3ddaf3b..6a6cf922 100644 --- a/src/webserver/civetweb/CMakeLists.txt +++ b/src/webserver/civetweb/CMakeLists.txt @@ -18,6 +18,7 @@ set(sources ) add_library(civetweb OBJECT ${sources}) +target_compile_options(civetweb PRIVATE -Wno-unused-but-set-variable -Wno-unused-variable) # We can remove the NO_SSL later on. It adds additional constraints to the build system (availablity of libSSL-dev) # NO_CGI = no CGI support (we don't need it) # NO_SSL_DL NO_SSL = no SSL support (for now) @@ -42,6 +43,5 @@ else() target_compile_definitions(civetweb PRIVATE NO_SSL) endif() - include_directories(${PROJECT_SOURCE_DIR}/src/lua /usr/local/include) target_include_directories(civetweb PRIVATE ${PROJECT_SOURCE_DIR}/src) diff --git a/src/webserver/civetweb/mod_lua.inl b/src/webserver/civetweb/mod_lua.inl index b3733e8b..e9d90ca5 100644 --- a/src/webserver/civetweb/mod_lua.inl +++ b/src/webserver/civetweb/mod_lua.inl @@ -2793,7 +2793,11 @@ lua_error_handler(lua_State *L) static void prepare_lua_environment(struct mg_context *ctx, struct mg_connection *conn, +#if defined(USE_WEBSOCKET) struct lua_websock_data *ws_conn_list, +#else + void *ws_conn_list, +#endif lua_State *L, const char *script_name, int lua_env_type) diff --git a/src/zip/miniz/miniz.c b/src/zip/miniz/miniz.c index 54b85dbf..1195e620 100644 --- a/src/zip/miniz/miniz.c +++ b/src/zip/miniz/miniz.c @@ -3182,7 +3182,7 @@ static int mz_stat64(const char *path, struct __stat64 *buffer) #define MZ_DELETE_FILE remove #else -#pragma message("Using fopen, ftello, fseeko, stat() etc. path for file I/O - this path may not support large files.") +//#pragma message("Using fopen, ftello, fseeko, stat() etc. path for file I/O - this path may not support large files.") #ifndef MINIZ_NO_TIME #include #endif