Moved lite source to folders|

lite/CMakeLists.txt

-cmake_minimum_required(VERSION 3.1)
-project(spdlog_lite)
-
-add_library(spdlog_lite spdlite.cpp spdlite.h spdlite_global.cpp spdlite_global.h spdlite_macros.h)
-
-target_link_libraries(spdlog_lite spdlog::spdlog)

spdlite/CMakeLists.txt

+cmake_minimum_required(VERSION 3.1)
+project(spdlite)
+
+include_directories(${PROJECT_SOURCE_DIR}/include)
+file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/src/*.cpp)
+file(GLOB HEADER_FILES ${PROJECT_SOURCE_DIR}/include/*.h)
+
+add_library(spdlite ${SRC_FILES} ${HEADER_FILES})
+
+target_link_libraries(spdlite spdlog::spdlog)
+
+add_subdirectory(example)    
+
+

lite-example/CMakeLists.txt → spdlite/example/CMakeLists.txt

-project(spdlog-lite-example CXX)
-
-find_package(Threads REQUIRED)
+project(spdlite-example CXX)
 
 set(LITE_SOURCES example.cpp create_logger.cpp)
 
 add_executable(${PROJECT_NAME} ${LITE_SOURCES})
 
-include_directories(../lite)
+find_package(Threads)
 target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads)
-target_link_libraries(${PROJECT_NAME} PRIVATE spdlog_lite)
+target_link_libraries(${PROJECT_NAME} PRIVATE spdlite)
 
 

lite-example/create_logger.cpp → spdlite/example/create_logger.cpp

 // Copyright(c) 2015-present Gabi Melman.
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
-#include "spdlite.h"
+#include "spdlite/spdlite.h"
 #include "spdlog/spdlog.h"
 #include "spdlog/sinks/basic_file_sink.h"
 

lite-example/example.cpp → spdlite/example/example.cpp

-// Copyright(c) 2015-present Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-
-#include "spdlite.h"
-#include "spdlite_global.h"
-
-#define SPDLITE_ACTIVE_LEVEL SPDLITE_LEVEL_TRACE
-#include "spdlite_macros.h"
-int main()
-{
-    SPDLITE_TRACE("SOME INFO {}", 123);
+// Copyright(c) 2015-present Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+
+#include "spdlite/spdlite.h"
+#include "spdlite/spdlite_global.h"
+
+#define SPDLITE_ACTIVE_LEVEL SPDLITE_LEVEL_TRACE
+#include "spdlite/spdlite_macros.h"
+int main()
+{
+    SPDLITE_TRACE("SOME INFO {}", 123);
 }
\ No newline at end of file

lite/spdlite.cpp → spdlite/src/spdlite.cpp

-//
-// Copyright(c) 2019-present spdlog
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include "spdlite.h"
-#include "spdlog/spdlog.h"
-
-static spdlog::level::level_enum to_spdlog_level(spdlite::level level)
-{
-    return static_cast<spdlog::level::level_enum>(level);
-}
-
-static spdlite::level to_lite_level(spdlog::level::level_enum level)
-{
-    return static_cast<spdlite::level>(level);
-}
-
-spdlite::logger::logger(std::shared_ptr<spdlog::logger> impl)
-{
-    impl_ = std::move(impl);
-}
-
-void spdlite::logger::set_impl(std::shared_ptr<spdlog::logger> impl)
-{
-    impl_ = std::move(impl);
-}
-
-bool spdlite::logger::should_log(spdlite::level level) const SPDLOG_NOEXCEPT
-{
-    auto spd_level = to_spdlog_level(level);
-    return impl_->should_log(spd_level); // TODO avoid the call using local level member?
-}
-
-void spdlite::logger::log(spdlite::level lvl, const string_view_t &sv)
-{
-    auto spd_level = to_spdlog_level(lvl);
-    impl_->log(spd_level, sv);
-}
-
-void spdlite::logger::log_printf(spdlite::level lvl, const char *format, va_list args)
-{
-    char buffer[256];
-    auto size = vsnprintf(buffer, sizeof(buffer), format, args);
-    if (size < 0)
-    {
-        size = snprintf(buffer, sizeof(buffer), "invalid format (%s)", format);
-    }
-    log(lvl, string_view_t{buffer, static_cast<size_t>(size)});
-}
-
-void spdlite::logger::trace_printf(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    log_printf(spdlite::level::trace, format, args);
-    va_end(args);
-}
-
-void spdlite::logger::debug_printf(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    log_printf(spdlite::level::debug, format, args);
-    va_end(args);
-}
-
-void spdlite::logger::info_printf(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    log_printf(spdlite::level::info, format, args);
-    va_end(args);
-}
-
-void spdlite::logger::warn_printf(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    log_printf(spdlite::level::warn, format, args);
-    va_end(args);
-}
-
-void spdlite::logger::error_printf(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    log_printf(spdlite::level::err, format, args);
-    va_end(args);
-}
-
-void spdlite::logger::critical_printf(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    log_printf(spdlite::level::critical, format, args);
-    va_end(args);
-}
-
-void spdlite::logger::set_level(spdlite::level level) noexcept
-{
-    auto spd_level = to_spdlog_level(level);
-    impl_->set_level(spd_level);
-}
-
-spdlite::level spdlite::logger::level() const noexcept
-{
-    return to_lite_level(impl_->level());
-}
-
-std::string spdlite::logger::name() const noexcept
-{
-    return impl_->name();
-}
-
-void spdlite::logger::flush()
-{
-    impl_->flush();
-}
-
-void spdlite::logger::flush_on(spdlite::level level)
-{
-    auto spd_level = to_spdlog_level(level);
-    impl_->flush_on(spd_level);
-}
-
-spdlite::level spdlite::logger::flush_level() const noexcept
-{
-    return to_lite_level(impl_->flush_level());
-}
-
-// pattern
-void spdlite::logger::set_pattern(std::string pattern) noexcept
-{
-    impl_->set_pattern(std::move(pattern));
-}
-
-spdlite::logger spdlite::logger::clone(std::string logger_name)
-{
-    return spdlite::logger(impl_->clone(std::move(logger_name)));
-}
-
-void spdlite::logger::log_formatted_(spdlite::level lvl, const fmt::memory_buffer &formatted)
-{
-    auto spd_level = to_spdlog_level(lvl);
-    impl_->log(spd_level, spdlog::details::fmt_helper::to_string_view(formatted));
-}
-
-spdlite::logger &spdlite::logger::default_logger()
-{
-    static spdlite::logger default_inst_ = spdlite::logger(spdlog::default_logger());
-    return default_inst_;
-}
-
-
+//
+// Copyright(c) 2019-present spdlog
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#include "spdlite/spdlite.h"
+#include "spdlog/spdlog.h"
+
+static spdlog::level::level_enum to_spdlog_level(spdlite::level level)
+{
+    return static_cast<spdlog::level::level_enum>(level);
+}
+
+static spdlite::level to_lite_level(spdlog::level::level_enum level)
+{
+    return static_cast<spdlite::level>(level);
+}
+
+spdlite::logger::logger(std::shared_ptr<spdlog::logger> impl)
+{
+    impl_ = std::move(impl);
+}
+
+void spdlite::logger::set_impl(std::shared_ptr<spdlog::logger> impl)
+{
+    impl_ = std::move(impl);
+}
+
+bool spdlite::logger::should_log(spdlite::level level) const SPDLOG_NOEXCEPT
+{
+    auto spd_level = to_spdlog_level(level);
+    return impl_->should_log(spd_level); // TODO avoid the call using local level member?
+}
+
+void spdlite::logger::log(spdlite::level lvl, const string_view_t &sv)
+{
+    auto spd_level = to_spdlog_level(lvl);
+    impl_->log(spd_level, sv);
+}
+
+void spdlite::logger::log_printf(spdlite::level lvl, const char *format, va_list args)
+{
+    char buffer[256];
+    auto size = vsnprintf(buffer, sizeof(buffer), format, args);
+    if (size < 0)
+    {
+        size = snprintf(buffer, sizeof(buffer), "invalid format (%s)", format);
+    }
+    log(lvl, string_view_t{buffer, static_cast<size_t>(size)});
+}
+
+void spdlite::logger::trace_printf(const char *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    log_printf(spdlite::level::trace, format, args);
+    va_end(args);
+}
+
+void spdlite::logger::debug_printf(const char *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    log_printf(spdlite::level::debug, format, args);
+    va_end(args);
+}
+
+void spdlite::logger::info_printf(const char *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    log_printf(spdlite::level::info, format, args);
+    va_end(args);
+}
+
+void spdlite::logger::warn_printf(const char *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    log_printf(spdlite::level::warn, format, args);
+    va_end(args);
+}
+
+void spdlite::logger::error_printf(const char *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    log_printf(spdlite::level::err, format, args);
+    va_end(args);
+}
+
+void spdlite::logger::critical_printf(const char *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    log_printf(spdlite::level::critical, format, args);
+    va_end(args);
+}
+
+void spdlite::logger::set_level(spdlite::level level) noexcept
+{
+    auto spd_level = to_spdlog_level(level);
+    impl_->set_level(spd_level);
+}
+
+spdlite::level spdlite::logger::level() const noexcept
+{
+    return to_lite_level(impl_->level());
+}
+
+std::string spdlite::logger::name() const noexcept
+{
+    return impl_->name();
+}
+
+void spdlite::logger::flush()
+{
+    impl_->flush();
+}
+
+void spdlite::logger::flush_on(spdlite::level level)
+{
+    auto spd_level = to_spdlog_level(level);
+    impl_->flush_on(spd_level);
+}
+
+spdlite::level spdlite::logger::flush_level() const noexcept
+{
+    return to_lite_level(impl_->flush_level());
+}
+
+// pattern
+void spdlite::logger::set_pattern(std::string pattern) noexcept
+{
+    impl_->set_pattern(std::move(pattern));
+}
+
+spdlite::logger spdlite::logger::clone(std::string logger_name)
+{
+    return spdlite::logger(impl_->clone(std::move(logger_name)));
+}
+
+void spdlite::logger::log_formatted_(spdlite::level lvl, const fmt::memory_buffer &formatted)
+{
+    auto spd_level = to_spdlog_level(lvl);
+    impl_->log(spd_level, spdlog::details::fmt_helper::to_string_view(formatted));
+}
+
+spdlite::logger &spdlite::logger::default_logger()
+{
+    static spdlite::logger default_inst_ = spdlite::logger(spdlog::default_logger());
+    return default_inst_;
+}
+
+

lite/spdlite_global.cpp → spdlite/src/spdlite_global.cpp

-// Copyright(c) 2015-present Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-
-#include "spdlite_global.h"
-
-spdlite::logger &spdlite::default_logger()
-{
-	return spdlite::logger::default_logger();
-}
-
-// printf
-void spdlite::log_printf(spdlite::level lvl, const char *format, va_list args)
-{
-	default_logger().log_printf(lvl, format, args);
-}
-
-void spdlite::trace_printf(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	log_printf(level::trace, format, args);
-	va_end(args);
-}
-
-void spdlite::debug_printf(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	log_printf(level::debug, format, args);
-	va_end(args);
-}
-
-void spdlite::info_printf(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	log_printf(level::info, format, args);
-	va_end(args);
-}
-
-void spdlite::warn_printf(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	log_printf(level::warn, format, args);
-	va_end(args);
-}
-
-void spdlite::error_printf(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	log_printf(level::err, format, args);
-	va_end(args);
-}
-
-void spdlite::critical_printf(const char *format, ...)
-{
-	va_list args;
-	va_start(args, format);
-	log_printf(level::critical, format, args);
-	va_end(args);
+// Copyright(c) 2015-present Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+
+#include "spdlite/spdlite_global.h"
+
+spdlite::logger &spdlite::default_logger()
+{
+	return spdlite::logger::default_logger();
+}
+
+// printf
+void spdlite::log_printf(spdlite::level lvl, const char *format, va_list args)
+{
+	default_logger().log_printf(lvl, format, args);
+}
+
+void spdlite::trace_printf(const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	log_printf(level::trace, format, args);
+	va_end(args);
+}
+
+void spdlite::debug_printf(const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	log_printf(level::debug, format, args);
+	va_end(args);
+}
+
+void spdlite::info_printf(const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	log_printf(level::info, format, args);
+	va_end(args);
+}
+
+void spdlite::warn_printf(const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	log_printf(level::warn, format, args);
+	va_end(args);
+}
+
+void spdlite::error_printf(const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	log_printf(level::err, format, args);
+	va_end(args);
+}
+
+void spdlite::critical_printf(const char *format, ...)
+{
+	va_list args;
+	va_start(args, format);
+	log_printf(level::critical, format, args);
+	va_end(args);
 }
\ No newline at end of file