Extracted re-logging into its own project

pongasoft · Jan 24, 2022 · 467123d · 467123d
1 parent 3e084a2
commit 467123d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 3,620 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/README.md b/README.md
@@ -318,6 +318,10 @@ It is strongly recommended checking the [re-blank-plugin](https://github.com/pon
 
 Release notes
 -------------
+#### 1.4.2 - 2022/01/24
+
+- Extracted `re-logging` into its own project
+
 #### 1.4.1 - 2022/01/23
 
 - Added `JBOX_LOGVALUES` (simpler api than `JBOX_TRACEVALUES`)

diff --git a/cmake/RECMakeOptions.cmake b/cmake/RECMakeOptions.cmake
@@ -61,8 +61,14 @@ set(googletest_GIT_TAG "e2239ee6043f73722e7aa812a459f54a28552929" CACHE STRING "
 #------------------------------------------------------------------------
 set(RE_CMAKE_RE_2D_RENDER_HI_RES_OPTION "hi-res-only" CACHE STRING "Option for invoking RE2DRender for hi res build (hi-res or hi-res-only)")
 
+#------------------------------------------------------------------------
+# Git repo/tag for re-logging
+#------------------------------------------------------------------------
+set(re-logging_GIT_REPO "https://github.com/pongasoft/re-logging" CACHE STRING "re-logging git repository url")
+set(re-logging_GIT_TAG "v1.0.0" CACHE STRING "re-logging git tag")
+
 #------------------------------------------------------------------------
 # Git repo/tag for re-mock
 #------------------------------------------------------------------------
 set(re-mock_GIT_REPO "https://github.com/pongasoft/re-mock" CACHE STRING "re-mock git repository url")
-set(re-mock_GIT_TAG "v1.0.0" CACHE STRING "re-cmake git tag")
+set(re-mock_GIT_TAG "v1.0.0" CACHE STRING "re-mock git tag")
diff --git a/main.cmake b/main.cmake
@@ -56,17 +56,9 @@ macro(re_cmake_include)
   )
 
   if(ARG_re-logging)
-    set(re-logging_ROOT_DIR "${re-cmake_ROOT_DIR}/re-logging")
-    set(re-logging_SOURCE_DIR "${re-logging_ROOT_DIR}/src/cpp/logging")
-    set(re-logging_INCLUDE_DIRS "${re-logging_SOURCE_DIR}")
-
-    # Defines the files to include for logging (they will be included in the Recon build ONLY)
-    set(re-logging_SOURCES
-        ${re-logging_SOURCE_DIR}/logging.h
-        ${re-logging_SOURCE_DIR}/loguru.cpp
-        ${re-logging_SOURCE_DIR}/loguru.hpp
-        )
-    message(STATUS "Using re-logging from local ${re-logging_ROOT_DIR}")
+    include("${re-cmake_ROOT_DIR}/cmake/RECMakeFetchContent.cmake")
+    re_cmake_fetch_content(NAME re-logging)
+    include("${re-logging_ROOT_DIR}/re-logging.cmake")
   endif()
 
   if(ARG_re-mock)

diff --git a/re-logging/src/cpp/logging/logging.h b/re-logging/src/cpp/logging/logging.h