* refactored cmake structure

CMakeLists.txt

@@ -5,10 +5,16 @@ If                          ( NOT CMAKE_BUILD_TYPE )
 EndIf                       ( NOT CMAKE_BUILD_TYPE )
 
 CMake_Minimum_Required      ( VERSION 3.5.1 FATAL_ERROR )
-Set                         ( CMAKE_CXX_STANDARD 14 )
+Set                         ( CMAKE_CXX_STANDARD 17 )
+Set                         ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../../inc/cmake/")
 Include                     ( GlobalCompilerFlags OPTIONAL )
 Include                     ( cotire OPTIONAL )
 
+# Tests ###########################################################################################
+
+Include                     ( CTest )
+Enable_Testing              ( )
+
 # Projects ########################################################################################
 
 Add_SubDirectory            ( ${CMAKE_CURRENT_SOURCE_DIR}/src )

src/CMakeLists.txt

@@ -1,13 +1,12 @@
 # Project: cpputils ###############################################################################
 
-Project                     ( cpputils )
-File                        ( GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/impl/*.cpp )
-Add_Library                 ( cpputils STATIC ${SOURCE_FILES} )
-Include_Directories         ( ${CMAKE_CURRENT_SOURCE_DIR} )
+Project                     ( cpputils VERSION 1.0.0.0 LANGUAGES CXX )
+File                        ( GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp )
+Add_Library                 ( cpputils ${SOURCE_FILES} )
 Target_Include_Directories  (
                                 cpputils
-                                INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}
+                                PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../include
                             )
 If                          ( __COTIRE_INCLUDED )
     Cotire                      ( cpputils )
-EndIf                       ( )
+EndIf                       ( )

src/impl/logging/LoggerImpl.cpp.old

@@ -1,119 +0,0 @@
-#include <list>
-#include <iomanip>
-
-#include "cpputils/logger_impl.h"
-
-using namespace logging;
-
-std::string EmptyString;
-
-consumer::consumer(const std::string& n, bool autoRegister) :
-    _name(n)
-{
-    if (autoRegister)
-        register_consumer(*this);
-}
-
-consumer::~consumer()
-    { unregister_consumer(*this); }
-
-void consumer_stream::log(data_ptr_s data)
-{
-    std::lock_guard<std::mutex> lk(_mutex);
-
-    using namespace std;
-    if (!data)
-        return;
-    auto& d = *data;
-    auto t = std::chrono::duration_cast<std::chrono::duration<double, std::ratio<1>>>(d.time.time_since_epoch()).count();
-    auto f = d.file;
-    if (f)
-    {
-        auto tmp = strrchr(f, '/');
-        if (tmp)
-            f = tmp + 1;
-    }
-    else
-        f = "unknown";
-
-    StreamFormatSaver formatSaver(*_stream);
-    if (t >= 0)                         *_stream << "["   << fixed << setfill(' ') << setw(17) <<  setprecision(6) << t << "] ";
-    switch(d.level)
-    {
-        case level::Debug:              *_stream << "DEBUG "; break;
-        case level::Info:               *_stream << "INFO  "; break;
-        case level::Warn:               *_stream << "WARN  "; break;
-        case level::Error:              *_stream << "ERROR "; break;
-    }
-
-    if (d.sender)                       *_stream << "0x"  << hex << setw(2 * sizeof(void*)) << setfill('0') << d.sender;
-    else                                *_stream << "                  ";
-    if (d.thread != std::thread::id())  *_stream << "@"   << hex << setw(2 * sizeof(void*)) << setfill('0') << d.thread;
-    else                                *_stream << "                 ";
-    if (!d.name.empty())                *_stream << " '" << d.name << "'";
-    if (d.line)                         *_stream << " - " << setw(25) << setfill(' ') << f << ":" << setw(5) << setfill(' ') << dec << d.line;
-    if (!d.message.empty())
-    {
-        *_stream << ": "  << d.message;
-        if (d.message.back() != '\n')
-            *_stream << std::endl;
-    }
-    else
-        *_stream << std::endl;
-}
-
-
-
-bool matcher_all::match(const logger& logger) const
-    { return true; }
-
-bool matcher_all::match(const consumer& consumer) const
-    { return true; }
-
-bool matcher_regex::match(const logger& logger) const
-    { return !logger.name().empty() && std::regex_match(logger.name(), _regex) != _invert; }
-
-bool matcher_regex::match(const consumer& consumer) const
-    { return !consumer.name().empty() && std::regex_match(consumer.name(), _regex) != _invert; }
-
-bool matcher_default::match(const logger& logger) const
-    { return &_defaultLogger == &logger; }
-
-
-
-
-const std::string& logger::name() const
-    { return EmptyString; }
-
-bool logger::is_enabled(level level) const
-    { return false; }
-
-void logger::log(data_ptr_s data) const
-    { /* no op */ }
-
-
-
-const std::string& logger_impl::name() const
-    { return _name; }
-
-bool logger_impl::is_enabled(level level) const
-{
-    for (auto& rule : _rules)
-    {
-        if (rule->is_enabled(level))
-            return true;
-    }
-    return false;
-}
-
-void logger_impl::log(data_ptr_s data) const
-{
-    std::lock_guard<std::mutex> lk(_mutex);
-    for (auto& r : _rules)
-        r->log(data);
-}
-
-namespace logging
-{
-    
-}

test/CMakeLists.txt

@@ -15,9 +15,21 @@ Target_Link_Libraries       (
                                 pthread
                             )
 
-Add_Custom_Target           ( run_test_cpputils DEPENDS test_cpputils COMMAND ./test_cpputils )
+# Build Tests #####################################################################################
+
+If                          ( NOT TARGET build_tests)
+    Add_Custom_Target           ( build_tests )
+EndIf                       ( )
+Add_Dependencies            ( build_tests test_cpputils )
+
+# Run Tests #######################################################################################
 
 If                          ( NOT TARGET tests)
     Add_Custom_Target           ( tests )
 EndIf                       ( )
-Add_Dependencies            ( tests run_test_cpputils )
+Add_Custom_Target           ( run_test_cpputils DEPENDS test_cpputils COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test_cpputils )
+Add_Dependencies            ( tests run_test_cpputils )
+
+# CTest ###########################################################################################
+
+Add_Test                    ( NAME cpputils COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test_cpputils )