From f1f6d98c4ca0b055fd5b61eab522ee23e9efda24 Mon Sep 17 00:00:00 2001 From: Majid Q Date: Thu, 20 Jul 2023 13:44:00 +1000 Subject: [PATCH] chore updates --- CHANGELOG.md | 4 ++++ CMakeLists.txt | 29 ++++++++++++++--------------- README.md | 4 ++-- cmake/FindEASYLOGGINGPP.cmake | 6 ++---- src/easylogging++.cc | 6 +++--- src/easylogging++.h | 2 +- tools/release.sh | 2 +- 7 files changed, 27 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 247463183..1dfd2ea7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 538cc8a0b..8604a546e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() @@ -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) @@ -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() @@ -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() diff --git a/README.md b/README.md index 422e09e58..90f7af323 100644 --- a/README.md +++ b/README.md @@ -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) @@ -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. diff --git a/cmake/FindEASYLOGGINGPP.cmake b/cmake/FindEASYLOGGINGPP.cmake index 400e0b599..3ad7e1fc3 100644 --- a/cmake/FindEASYLOGGINGPP.cmake +++ b/cmake/FindEASYLOGGINGPP.cmake @@ -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...") diff --git a/src/easylogging++.cc b/src/easylogging++.cc index a02d6629b..bd87b8dd8 100644 --- a/src/easylogging++.cc +++ b/src/easylogging++.cc @@ -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.) @@ -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 diff --git a/src/easylogging++.h b/src/easylogging++.h index b842ee2b2..f24b9302d 100644 --- a/src/easylogging++.h +++ b/src/easylogging++.h @@ -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.) diff --git a/tools/release.sh b/tools/release.sh index d49d66946..60e7fe226 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -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]