Skip to content

Commit

Permalink
chore updates
Browse files Browse the repository at this point in the history
  • Loading branch information
abumq committed Jul 20, 2023
1 parent 3bbb9a5 commit f1f6d98
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 26 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [9.97.1] - 20-07-2023
### Chore
* Rebuilt with latest gtest

## [9.97.0] - 25-12-2020
### Features
* Support for QNX OS
Expand Down
29 changes: 14 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ cmake_minimum_required(VERSION 2.8.7)

project(Easyloggingpp CXX)

macro(require_cpp11)
macro(require_cpp14)
if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.0)
# CMake 3.1 has built-in CXX standard checks.
message("-- Setting C++11")
set(CMAKE_CXX_STANDARD 11)
message("-- Setting C++14")
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED on)
else()
if (CMAKE_CXX_COMPILER_ID MATCHES "GCC")
message ("-- GNU CXX (-std=c++11)")
list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
message ("-- GNU CXX (-std=c++14)")
list(APPEND CMAKE_CXX_FLAGS "-std=c++14")
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message ("-- CLang CXX (-std=c++11)")
list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
message ("-- CLang CXX (-std=c++14)")
list(APPEND CMAKE_CXX_FLAGS "-std=c++14")
else()
message ("-- Easylogging++ requires C++11. Your compiler does not support it.")
message ("-- Easylogging++ requires C++14. Your compiler does not support it.")
endif()
endif()
endmacro()
Expand Down Expand Up @@ -57,7 +57,7 @@ if (build_static_lib)
add_definitions(-DELPP_UTC_DATETIME)
endif()

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

Expand All @@ -71,13 +71,12 @@ export(PACKAGE ${PROJECT_NAME})

########################################## Unit Testing ###################################
if (test)
# We need C++11
require_cpp11()
# We need C++14 (Google Test requirement)
require_cpp14()
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")

find_package (gtest REQUIRED)

include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
find_package (GTest REQUIRED)
include_directories (${GTEST_INCLUDE_DIRS})

enable_testing()

Expand All @@ -98,7 +97,7 @@ if (test)
)

# Standard linking to gtest stuff.
target_link_libraries(easyloggingpp-unit-tests gtest gtest_main)
target_link_libraries(easyloggingpp-unit-tests ${GTEST_BOTH_LIBRARIES})

add_test(NAME easyloggingppUnitTests COMMAND easyloggingpp-unit-tests -v)
endif()
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

![banner]

> **Documentation for v9.97.0**
> **Documentation for v9.97.1**
[![Node Binding Version](https://img.shields.io/github/release/abumq/easyloggingpp.svg)](https://github.com/abumq/easyloggingpp-node/releases/latest)
[![Version](https://img.shields.io/npm/v/easyloggingpp.svg)](https://www.npmjs.com/package/easyloggingpp)
Expand Down Expand Up @@ -99,7 +99,7 @@
# Overview
Easylogging++ is single header efficient logging library for C++ applications. It is extremely powerful, highly extendable and configurable to user's requirements. It provides ability to [write your own _sinks_](/samples/send-to-network) (via featured referred as `LogDispatchCallback`). This library is currently used by [hundreds of open-source projects on github](https://github.com/search?q=%22easylogging%2B%2B.h%22&type=Code&utf8=%E2%9C%93) and other open-source source control management sites.

This manual is for Easylogging++ v9.96.7. For other versions please refer to corresponding [release](https://github.com/abumq/easyloggingpp/releases) on github.
This manual is for Easylogging++ v9.97.1. For other versions please refer to corresponding [release](https://github.com/abumq/easyloggingpp/releases) on github.

> You may also be interested in [Residue](https://github.com/abumq/residue/) logging server.
Expand Down
6 changes: 2 additions & 4 deletions cmake/FindEASYLOGGINGPP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
# If ${EASYLOGGINGPP_USE_STATIC_LIBS} is ON then static libs are searched.
# In these cases ${EASYLOGGINGPP_LIBRARY} is also defined
#
# (c) 2017-2018 Amrayn Web Services
# Copyright (c) 2012-present @abumq (Majid Q.)
#
# https://github.com/amrayn/easyloggingpp
# https://amrayn.com
# https://muflihun.com
# https://github.com/abumq/easyloggingpp
#

message ("-- Easylogging++: Searching...")
Expand Down
6 changes: 3 additions & 3 deletions src/easylogging++.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Bismillah ar-Rahmaan ar-Raheem
//
// Easylogging++ v9.96.7
// Easylogging++ v9.97.1
// Cross-platform logging library for C++ applications
//
// Copyright (c) 2012-present @abumq (Majid Q.)
Expand Down Expand Up @@ -3106,11 +3106,11 @@ void Loggers::clearVModules(void) {
// VersionInfo

const std::string VersionInfo::version(void) {
return std::string("9.96.7");
return std::string("9.97.1");
}
/// @brief Release date of current version
const std::string VersionInfo::releaseDate(void) {
return std::string("24-11-2018 0728hrs");
return std::string("Thu Jul 20 2023 13:45:52 GMT+1000");
}

} // namespace el
2 changes: 1 addition & 1 deletion src/easylogging++.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Bismillah ar-Rahmaan ar-Raheem
//
// Easylogging++ v9.96.7
// Easylogging++ v9.97.1
// Single-header only, cross-platform logging library for C++ applications
//
// Copyright (c) 2012-present @abumq (Majid Q.)
Expand Down
2 changes: 1 addition & 1 deletion tools/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Bash script that helps with releasing new versions of Easylogging++
# Revision: 1.5
# author @abumusamq
# author @abumq
#
# Usage:
# ./release.sh [repo-root] [homepage-repo-root] [curr-version] [new-version] [do-not-ask]
Expand Down

0 comments on commit f1f6d98

Please sign in to comment.