Skip to content

build: stop using Make automatic filename expression #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
edsiper wants to merge 2 commits into from
Closed

build: stop using Make automatic filename expression #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94f1e00
CMakelists.txt: Stop using Make automatic variable
nikomauno Oct 7, 2024
9ef34ef
core: namespace filename macro
edsiper Jul 13, 2026
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
8 changes: 2 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR 7)
set(CTR_VERSION_PATCH 1)
set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}")

# Define __FILENAME__ consistently across Operating Systems
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
endif()
# Define __CTR_FILENAME__
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CTR_FILENAME__=__FILE__")

# Configuration options
option(CTR_DEV "Enable development mode" No)
Expand Down
14 changes: 7 additions & 7 deletions include/ctraces/ctr_log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,27 @@ void ctr_log_print(void *ctx, int level, const char *file, int line,
int ctr_errno_print(int errnum, const char *file, int line);

#define ctr_log_error(ctx, fmt, ...) \
ctr_log_print(ctx, CTR_LOG_ERROR, __FILENAME__, \
ctr_log_print(ctx, CTR_LOG_ERROR, __CTR_FILENAME__, \
__LINE__, fmt, ##__VA_ARGS__)

#define ctr_log_warn(ctx, fmt, ...) \
ctr_log_print(ctx, CTR_LOG_WARN, __FILENAME__, \
ctr_log_print(ctx, CTR_LOG_WARN, __CTR_FILENAME__, \
__LINE__, fmt, ##__VA_ARGS__)

#define ctr_log_info(ctx, fmt, ...) \
ctr_log_print(ctx, CTR_LOG_INFO, __FILENAME__, \
ctr_log_print(ctx, CTR_LOG_INFO, __CTR_FILENAME__, \
__LINE__, fmt, ##__VA_ARGS__)

#define ctr_log_debug(ctx, fmt, ...) \
ctr_log_print(ctx, CTR_LOG_DEBUG, __FILENAME__, \
ctr_log_print(ctx, CTR_LOG_DEBUG, __CTR_FILENAME__, \
__LINE__, fmt, ##__VA_ARGS__)

#define ctr_log_trace(ctx, fmt, ...) \
ctr_log_print(ctx, CTR_LOG_TRACE, __FILENAME__, \
ctr_log_print(ctx, CTR_LOG_TRACE, __CTR_FILENAME__, \
__LINE__, fmt, ##__VA_ARGS__)

#ifdef __FILENAME__
#define ctr_errno() ctr_errno_print(errno, __FILENAME__, __LINE__)
#ifdef __CTR_FILENAME__
#define ctr_errno() ctr_errno_print(errno, __CTR_FILENAME__, __LINE__)
#else
#define ctr_errno() ctr_errno_print(errno, __FILE__, __LINE__)
#endif
Expand Down
Loading