Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,47 @@ if(NOT BUILD_SHARED_LIBS)
set(MXL_POSITION_INDEPENDENT_CODE ${MXL_ENABLE_PIC})
endif()

#-------------------------------------------------------------------------------
# Helper to conditionally add flags supported by the current compiler
#-------------------------------------------------------------------------------
include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)

function(mxl_check_and_add_flag flag)
string(REGEX REPLACE "^-+" "" var "${flag}")
string(MAKE_C_IDENTIFIER "${var}" var)
string(TOUPPER "${var}" var)

set(c_var "MXL_C_COMPILER_SUPPORTS_${var}")
set(cxx_var "MXL_CXX_COMPILER_SUPPORTS_${var}")

set(lang_list "")
check_c_compiler_flag("${flag}" ${c_var})
if (${c_var})
list(APPEND lang_list C)
endif ()

check_cxx_compiler_flag("${flag}" ${cxx_var})
if (${cxx_var})
list(APPEND lang_list CXX)
endif ()

list(JOIN lang_list "," lang_list_string)
if (NOT "${lang_list_string}" STREQUAL "")
add_compile_options($<$<COMPILE_LANGUAGE:${lang_list_string}>:${flag}>)
endif ()
endfunction()

#-------------------------------------------------------------------------------
# Globally add warning flags
#-------------------------------------------------------------------------------
mxl_check_and_add_flag("-Wall")
mxl_check_and_add_flag("-Wextra")
mxl_check_and_add_flag("-Wunreachable-code")
mxl_check_and_add_flag("-Wpedantic")
mxl_check_and_add_flag("-Wno-c++23-attribute-extensions")


add_subdirectory(lib)
add_subdirectory(utils)
if (BUILD_TOOLS)
Expand Down
2 changes: 0 additions & 2 deletions lib/fabrics/ofi/src/internal/Address.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ namespace mxl::lib::fabrics::ofi

FabricAddress FabricAddress::fromBase64(std::string_view data)
{
return FabricAddress{base64::decode_into<std::vector<std::uint8_t>>(data)};

auto decoded = base64::decode_into<std::vector<std::uint8_t>>(data);
if (decoded.empty())
{
Expand Down
26 changes: 16 additions & 10 deletions tools/mxl-gst/utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,24 @@
/**
* Logging macros
*/
#define MXL_LOG(level, msg, ...) \
do \
{ \
std::cerr << "[" << level << "] " << " - " << fmt::format(msg, ##__VA_ARGS__) << std::endl; \
} \

// clang-format off
#define MXL_LOG(level, msg, ...) \
do \
{ \
std::cerr \
<< '[' << level << "] " << " - " \
<< fmt::format(msg __VA_OPT__(,) __VA_ARGS__) \
<< std::endl; \
} \
while (0)

#define MXL_ERROR(msg, ...) MXL_LOG("ERROR", msg, ##__VA_ARGS__)
#define MXL_WARN(msg, ...) MXL_LOG("WARN", msg, ##__VA_ARGS__)
#define MXL_INFO(msg, ...) MXL_LOG("INFO", msg, ##__VA_ARGS__)
#define MXL_DEBUG(msg, ...) MXL_LOG("DEBUG", msg, ##__VA_ARGS__)
#define MXL_TRACE(msg, ...) MXL_LOG("TRACE", msg, ##__VA_ARGS__)
#define MXL_ERROR(msg, ...) MXL_LOG("ERROR", msg __VA_OPT__(,) __VA_ARGS__)
#define MXL_WARN(msg, ...) MXL_LOG("WARN", msg __VA_OPT__(,) __VA_ARGS__)
#define MXL_INFO(msg, ...) MXL_LOG("INFO", msg __VA_OPT__(,) __VA_ARGS__)
#define MXL_DEBUG(msg, ...) MXL_LOG("DEBUG", msg __VA_OPT__(,) __VA_ARGS__)
#define MXL_TRACE(msg, ...) MXL_LOG("TRACE", msg __VA_OPT__(,) __VA_ARGS__)
// clang-format on

namespace media_utils
{
Expand Down