mirror of
https://github.com/gabime/spdlog.git
synced 2025-01-12 08:50:26 +08:00
Removed usages of SPDLOG_COMPILED_LIB macro
This commit is contained in:
parent
6d520df916
commit
cff3e27115
@ -176,7 +176,6 @@ if(SPDLOG_SYSTEM_INCLUDES)
|
|||||||
set(SPDLOG_INCLUDES_LEVEL "SYSTEM")
|
set(SPDLOG_INCLUDES_LEVEL "SYSTEM")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_compile_definitions(spdlog PUBLIC SPDLOG_COMPILED_LIB)
|
|
||||||
target_include_directories(spdlog ${SPDLOG_INCLUDES_LEVEL} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
|
target_include_directories(spdlog ${SPDLOG_INCLUDES_LEVEL} PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
|
||||||
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||||
target_link_libraries(spdlog PUBLIC Threads::Threads)
|
target_link_libraries(spdlog PUBLIC Threads::Threads)
|
||||||
|
@ -7,19 +7,14 @@
|
|||||||
|
|
||||||
//
|
//
|
||||||
// Include a bundled header-only copy of fmtlib or an external one.
|
// Include a bundled header-only copy of fmtlib or an external one.
|
||||||
// By default spdlog include its own copy.
|
// By default, spdlog include its own copy.
|
||||||
//
|
//
|
||||||
|
|
||||||
#if defined(SPDLOG_USE_STD_FORMAT) // SPDLOG_USE_STD_FORMAT is defined - use std::format
|
#if defined(SPDLOG_USE_STD_FORMAT) // SPDLOG_USE_STD_FORMAT is defined - use std::format
|
||||||
# include <format>
|
# include <format>
|
||||||
#elif !defined(SPDLOG_FMT_EXTERNAL)
|
#elif !defined(SPDLOG_FMT_EXTERNAL)
|
||||||
# if !defined(SPDLOG_COMPILED_LIB) && !defined(FMT_HEADER_ONLY)
|
|
||||||
# define FMT_HEADER_ONLY
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# include <spdlog/fmt/bundled/core.h>
|
# include <spdlog/fmt/bundled/core.h>
|
||||||
# include <spdlog/fmt/bundled/format.h>
|
# include <spdlog/fmt/bundled/format.h>
|
||||||
|
|
||||||
#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
|
#else // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
|
||||||
# include <fmt/core.h>
|
# include <fmt/core.h>
|
||||||
# include <fmt/format.h>
|
# include <fmt/format.h>
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
||||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
#ifndef SPDLOG_COMPILED_LIB
|
|
||||||
# error Please define SPDLOG_COMPILED_LIB to compile this file.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <spdlog/async.h>
|
#include <spdlog/async.h>
|
||||||
#include <spdlog/async_logger-inl.h>
|
#include <spdlog/async_logger-inl.h>
|
||||||
#include <spdlog/details/periodic_worker-inl.h>
|
#include <spdlog/details/periodic_worker-inl.h>
|
||||||
|
@ -2,10 +2,6 @@
|
|||||||
// Copyright (c) 2012 - 2016, Victor Zverovich
|
// Copyright (c) 2012 - 2016, Victor Zverovich
|
||||||
// All rights reserved.
|
// All rights reserved.
|
||||||
|
|
||||||
#ifndef SPDLOG_COMPILED_LIB
|
|
||||||
# error Please define SPDLOG_COMPILED_LIB to compile this file.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined(SPDLOG_FMT_EXTERNAL) && !defined(SPDLOG_USE_STD_FORMAT)
|
#if !defined(SPDLOG_FMT_EXTERNAL) && !defined(SPDLOG_USE_STD_FORMAT)
|
||||||
|
|
||||||
#include <spdlog/fmt/bundled/format-inl.h>
|
#include <spdlog/fmt/bundled/format-inl.h>
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
||||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
#ifndef SPDLOG_COMPILED_LIB
|
|
||||||
# error Please define SPDLOG_COMPILED_LIB to compile this file.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <spdlog/cfg/helpers-inl.h>
|
#include <spdlog/cfg/helpers-inl.h>
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
||||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
#ifndef SPDLOG_COMPILED_LIB
|
|
||||||
# error Please define SPDLOG_COMPILED_LIB to compile this file.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
|
||||||
#include <spdlog/details/null_mutex.h>
|
#include <spdlog/details/null_mutex.h>
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
||||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
#ifndef SPDLOG_COMPILED_LIB
|
|
||||||
# error Please define SPDLOG_COMPILED_LIB to compile this file.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <spdlog/details/null_mutex.h>
|
#include <spdlog/details/null_mutex.h>
|
||||||
#include <spdlog/details/file_helper-inl.h>
|
#include <spdlog/details/file_helper-inl.h>
|
||||||
#include <spdlog/sinks/basic_file_sink-inl.h>
|
#include <spdlog/sinks/basic_file_sink-inl.h>
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
||||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
#ifndef SPDLOG_COMPILED_LIB
|
|
||||||
# error Please define SPDLOG_COMPILED_LIB to compile this file.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <spdlog/spdlog-inl.h>
|
#include <spdlog/spdlog-inl.h>
|
||||||
#include <spdlog/common-inl.h>
|
#include <spdlog/common-inl.h>
|
||||||
#include <spdlog/details/registry-inl.h>
|
#include <spdlog/details/registry-inl.h>
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
|
||||||
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
// Distributed under the MIT License (http://opensource.org/licenses/MIT)
|
||||||
|
|
||||||
#ifndef SPDLOG_COMPILED_LIB
|
|
||||||
# error Please define SPDLOG_COMPILED_LIB to compile this file.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
|
||||||
#include <spdlog/details/null_mutex.h>
|
#include <spdlog/details/null_mutex.h>
|
||||||
|
@ -79,7 +79,6 @@ function(spdlog_prepare_test test_target spdlog_lib)
|
|||||||
set_tests_properties(${test_target} PROPERTIES RUN_SERIAL ON)
|
set_tests_properties(${test_target} PROPERTIES RUN_SERIAL ON)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
# The compiled library tests
|
|
||||||
if(SPDLOG_BUILD_TESTS OR SPDLOG_BUILD_ALL)
|
if(SPDLOG_BUILD_TESTS OR SPDLOG_BUILD_ALL)
|
||||||
spdlog_prepare_test(spdlog-utests spdlog::spdlog)
|
spdlog_prepare_test(spdlog-utests spdlog::spdlog)
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user