Skip to content
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.

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

Added CMake-support for commonly used preprocessor directives. #834

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## [9.97.1] - 11-05-2023

### Features
* CMake support for flags ELPP_FORCE_USE_STD_THREAD, ELPP_NO_DEFAULT_LOG_FILE and ELPP_THREAD_SAFE

## [9.97.0] - 25-12-2020
### Features
* Support for QNX OS
Expand Down
16 changes: 16 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ option(test "Build all tests" OFF)
option(build_static_lib "Build easyloggingpp as a static library" OFF)
option(lib_utc_datetime "Build library with UTC date/time logging" OFF)

option(no_default_logfile "Do not write to default log file \"myeasylog.log\" (define ELPP_NO_DEFAULT_LOG_FILE)" OFF)
option(thread_safe "Build easyloggingpp thread safe (define ELPP_THREAD_SAFE)" OFF)
option(use_std_threads "Use standard library thread synchronization (define ELPP_FORCE_USE_STD_THREAD)" OFF)

set(ELPP_MAJOR_VERSION "9")
set(ELPP_MINOR_VERSION "96")
set(ELPP_PATCH_VERSION "7")
Expand Down Expand Up @@ -57,6 +61,18 @@ if (build_static_lib)
add_definitions(-DELPP_UTC_DATETIME)
endif()

if (no_default_logfile)
add_definitions(-DELPP_NO_DEFAULT_LOG_FILE)
endif()

if (thread_safe)
add_definitions(-DELPP_THREAD_SAFE)
endif()

if (use_std_threads)
add_definitions(-DELPP_FORCE_USE_STD_THREAD)
endif()

require_cpp11()
add_library(easyloggingpp STATIC src/easylogging++.cc)
set_property(TARGET easyloggingpp PROPERTY POSITION_INDEPENDENT_CODE ON)
Expand Down