update easylogging++ to latest upstream
This commit is contained in:
parent
c9063c0b8f
commit
a8ac4f0a70
@ -348,8 +348,9 @@ endif()
|
|||||||
include_directories(${UNBOUND_INCLUDE})
|
include_directories(${UNBOUND_INCLUDE})
|
||||||
link_directories(${UNBOUND_LIBRARY_DIRS})
|
link_directories(${UNBOUND_LIBRARY_DIRS})
|
||||||
|
|
||||||
# Final setup for rapidjson
|
# Final setup for easylogging++
|
||||||
include_directories(external/rapidjson)
|
include_directories(${EASYLOGGING_INCLUDE})
|
||||||
|
link_directories(${EASYLOGGING_LIBRARY_DIRS})
|
||||||
|
|
||||||
# Final setup for liblmdb
|
# Final setup for liblmdb
|
||||||
include_directories(${LMDB_INCLUDE})
|
include_directories(${LMDB_INCLUDE})
|
||||||
|
@ -49,15 +49,6 @@
|
|||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
|
|
||||||
#define ELPP_THREAD_SAFE
|
|
||||||
#define ELPP_DEFAULT_LOG_FILE ""
|
|
||||||
#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__
|
|
||||||
#else
|
|
||||||
#define ELPP_STACKTRACE_ON_CRASH 1
|
|
||||||
#endif
|
|
||||||
#define ELPP_DISABLE_DEFAULT_CRASH_HANDLING
|
|
||||||
#define ELPP_FEATURE_CRASH_LOG 1
|
|
||||||
#define ELPP_DISABLE_CHECK_MACROS
|
|
||||||
#include "easylogging++.h"
|
#include "easylogging++.h"
|
||||||
|
|
||||||
#define MONERO_DEFAULT_LOG_CATEGORY "default"
|
#define MONERO_DEFAULT_LOG_CATEGORY "default"
|
||||||
|
@ -41,6 +41,7 @@ endif()
|
|||||||
target_link_libraries(epee
|
target_link_libraries(epee
|
||||||
PUBLIC
|
PUBLIC
|
||||||
crypto
|
crypto
|
||||||
|
easylogging
|
||||||
${Boost_FILESYSTEM_LIBRARY}
|
${Boost_FILESYSTEM_LIBRARY}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
${EXTRA_LIBRARIES})
|
${EXTRA_LIBRARIES})
|
||||||
|
1
external/CMakeLists.txt
vendored
1
external/CMakeLists.txt
vendored
@ -98,3 +98,4 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(db_drivers)
|
add_subdirectory(db_drivers)
|
||||||
|
add_subdirectory(easylogging++)
|
||||||
|
45
external/easylogging++/CMakeLists.txt
vendored
Normal file
45
external/easylogging++/CMakeLists.txt
vendored
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
# Copyright (c) 2014-2017, The Monero Project
|
||||||
|
#
|
||||||
|
# All rights reserved.
|
||||||
|
#
|
||||||
|
# Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
# permitted provided that the following conditions are met:
|
||||||
|
#
|
||||||
|
# 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
# conditions and the following disclaimer.
|
||||||
|
#
|
||||||
|
# 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
# of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
# materials provided with the distribution.
|
||||||
|
#
|
||||||
|
# 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
# used to endorse or promote products derived from this software without specific
|
||||||
|
# prior written permission.
|
||||||
|
#
|
||||||
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 2.8.7)
|
||||||
|
|
||||||
|
project(easylogging CXX)
|
||||||
|
|
||||||
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||||
|
|
||||||
|
find_package(Threads)
|
||||||
|
|
||||||
|
add_library(easylogging
|
||||||
|
easylogging++.cc)
|
||||||
|
|
||||||
|
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
|
||||||
|
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
|
||||||
|
target_link_libraries(easylogging
|
||||||
|
PRIVATE
|
||||||
|
${CMAKE_THREAD_LIBS_INIT})
|
||||||
|
|
11
external/easylogging++/ea_config.h
vendored
Normal file
11
external/easylogging++/ea_config.h
vendored
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#define ELPP_THREAD_SAFE
|
||||||
|
#define ELPP_DEFAULT_LOG_FILE ""
|
||||||
|
#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__
|
||||||
|
#else
|
||||||
|
#define ELPP_STACKTRACE_ON_CRASH 1
|
||||||
|
#endif
|
||||||
|
#define ELPP_DISABLE_DEFAULT_CRASH_HANDLING
|
||||||
|
#define ELPP_FEATURE_CRASH_LOG 1
|
||||||
|
#define ELPP_NO_CHECK_MACROS
|
2979
external/easylogging++/easylogging++.cc
vendored
Normal file
2979
external/easylogging++/easylogging++.cc
vendored
Normal file
File diff suppressed because it is too large
Load Diff
8846
external/easylogging++/easylogging++.h
vendored
8846
external/easylogging++/easylogging++.h
vendored
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user