Allow using system libfmt

Signed-off-by: Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
xmrig · May 29, 2023 · 0399b6b · 0399b6b
1 parent 65fc16d
commit 0399b6b
Show file tree

Hide file tree

Showing 46 changed files with 32 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -197,6 +197,7 @@ add_definitions(-D__STDC_FORMAT_MACROS -DUNICODE -D_FILE_OFFSET_BITS=64)
 find_package(UV REQUIRED)
 
 include(cmake/flags.cmake)
+include(cmake/fmt.cmake)
 include(cmake/randomx.cmake)
 include(cmake/argon2.cmake)
 include(cmake/kawpow.cmake)
@@ -228,15 +229,15 @@ include(src/hw/api/api.cmake)
 include(src/hw/dmi/dmi.cmake)
 
 include_directories(src)
-include_directories(src/3rdparty)
+include_directories(src/3rdparty/CL)
 include_directories(${UV_INCLUDE_DIR})
 
 if (WITH_DEBUG_LOG)
     add_definitions(/DAPP_DEBUG)
 endif()
 
 add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY} ${GHOSTRIDER_LIBRARY})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY} ${GHOSTRIDER_LIBRARY} ${FMT_LIBRARY})
 
 if (WIN32)
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/bin/WinRing0/WinRing0x64.sys" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)

diff --git a/cmake/fmt.cmake b/cmake/fmt.cmake
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: © 2023 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+find_package(fmt QUIET)
+
+if(fmt_FOUND)
+    set(FMT_LIBRARY fmt::fmt)
+else()
+    message(STATUS "Using bundled fmt library")
+    add_library(fmt INTERFACE)
+    target_sources(fmt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/fmt/format.cc)
+    target_include_directories(fmt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/fmt)
+    set(FMT_LIBRARY fmt)
+endif()
diff --git a/src/3rdparty/CL/LICENSE → src/3rdparty/CL/CL/LICENSE b/src/3rdparty/CL/LICENSE → src/3rdparty/CL/CL/LICENSE
diff --git a/src/3rdparty/CL/README.md → src/3rdparty/CL/CL/README.md b/src/3rdparty/CL/README.md → src/3rdparty/CL/CL/README.md
diff --git a/src/3rdparty/CL/cl.h → src/3rdparty/CL/CL/cl.h b/src/3rdparty/CL/cl.h → src/3rdparty/CL/CL/cl.h
diff --git a/src/3rdparty/CL/cl_d3d10.h → src/3rdparty/CL/CL/cl_d3d10.h b/src/3rdparty/CL/cl_d3d10.h → src/3rdparty/CL/CL/cl_d3d10.h
diff --git a/src/3rdparty/CL/cl_d3d11.h → src/3rdparty/CL/CL/cl_d3d11.h b/src/3rdparty/CL/cl_d3d11.h → src/3rdparty/CL/CL/cl_d3d11.h
diff --git a/src/3rdparty/CL/cl_dx9_media_sharing.h → src/3rdparty/CL/CL/cl_dx9_media_sharing.h b/src/3rdparty/CL/cl_dx9_media_sharing.h → src/3rdparty/CL/CL/cl_dx9_media_sharing.h
diff --git a/src/3rdparty/CL/cl_dx9_media_sharing_intel.h → ...dparty/CL/CL/cl_dx9_media_sharing_intel.h b/src/3rdparty/CL/cl_dx9_media_sharing_intel.h → ...dparty/CL/CL/cl_dx9_media_sharing_intel.h
diff --git a/src/3rdparty/CL/cl_egl.h → src/3rdparty/CL/CL/cl_egl.h b/src/3rdparty/CL/cl_egl.h → src/3rdparty/CL/CL/cl_egl.h
diff --git a/src/3rdparty/CL/cl_ext.h → src/3rdparty/CL/CL/cl_ext.h b/src/3rdparty/CL/cl_ext.h → src/3rdparty/CL/CL/cl_ext.h
diff --git a/src/3rdparty/CL/cl_ext_intel.h → src/3rdparty/CL/CL/cl_ext_intel.h b/src/3rdparty/CL/cl_ext_intel.h → src/3rdparty/CL/CL/cl_ext_intel.h
diff --git a/src/3rdparty/CL/cl_gl.h → src/3rdparty/CL/CL/cl_gl.h b/src/3rdparty/CL/cl_gl.h → src/3rdparty/CL/CL/cl_gl.h
diff --git a/src/3rdparty/CL/cl_gl_ext.h → src/3rdparty/CL/CL/cl_gl_ext.h b/src/3rdparty/CL/cl_gl_ext.h → src/3rdparty/CL/CL/cl_gl_ext.h
diff --git a/src/3rdparty/CL/cl_platform.h → src/3rdparty/CL/CL/cl_platform.h b/src/3rdparty/CL/cl_platform.h → src/3rdparty/CL/CL/cl_platform.h
diff --git a/...dparty/CL/cl_va_api_media_sharing_intel.h → ...rty/CL/CL/cl_va_api_media_sharing_intel.h b/...dparty/CL/cl_va_api_media_sharing_intel.h → ...rty/CL/CL/cl_va_api_media_sharing_intel.h
diff --git a/src/3rdparty/CL/cl_version.h → src/3rdparty/CL/CL/cl_version.h b/src/3rdparty/CL/cl_version.h → src/3rdparty/CL/CL/cl_version.h
diff --git a/src/3rdparty/CL/opencl.h → src/3rdparty/CL/CL/opencl.h b/src/3rdparty/CL/opencl.h → src/3rdparty/CL/CL/opencl.h
diff --git a/src/3rdparty/cl.h b/src/3rdparty/cl.h
@@ -29,7 +29,7 @@
 #if defined(__APPLE__)
 #   include <OpenCL/cl.h>
 #else
-#   include "3rdparty/CL/cl.h"
+#   include <CL/cl.h>
 #endif
 
 

diff --git a/src/3rdparty/fmt/LICENSE.rst → src/3rdparty/fmt/fmt/LICENSE.rst b/src/3rdparty/fmt/LICENSE.rst → src/3rdparty/fmt/fmt/LICENSE.rst
diff --git a/src/3rdparty/fmt/README.rst → src/3rdparty/fmt/fmt/README.rst b/src/3rdparty/fmt/README.rst → src/3rdparty/fmt/fmt/README.rst
diff --git a/src/3rdparty/fmt/chrono.h → src/3rdparty/fmt/fmt/chrono.h b/src/3rdparty/fmt/chrono.h → src/3rdparty/fmt/fmt/chrono.h
diff --git a/src/3rdparty/fmt/color.h → src/3rdparty/fmt/fmt/color.h b/src/3rdparty/fmt/color.h → src/3rdparty/fmt/fmt/color.h
diff --git a/src/3rdparty/fmt/compile.h → src/3rdparty/fmt/fmt/compile.h b/src/3rdparty/fmt/compile.h → src/3rdparty/fmt/fmt/compile.h
diff --git a/src/3rdparty/fmt/core.h → src/3rdparty/fmt/fmt/core.h b/src/3rdparty/fmt/core.h → src/3rdparty/fmt/fmt/core.h
diff --git a/src/3rdparty/fmt/format-inl.h → src/3rdparty/fmt/fmt/format-inl.h b/src/3rdparty/fmt/format-inl.h → src/3rdparty/fmt/fmt/format-inl.h
diff --git a/src/3rdparty/fmt/format.cc → src/3rdparty/fmt/fmt/format.cc b/src/3rdparty/fmt/format.cc → src/3rdparty/fmt/fmt/format.cc
@@ -5,7 +5,7 @@
 //
 // For the license information refer to format.h.
 
-#include "3rdparty/fmt/format-inl.h"
+#include "fmt/format-inl.h"
 
 FMT_BEGIN_NAMESPACE
 namespace detail {

diff --git a/src/3rdparty/fmt/format.h → src/3rdparty/fmt/fmt/format.h b/src/3rdparty/fmt/format.h → src/3rdparty/fmt/fmt/format.h
diff --git a/src/3rdparty/fmt/locale.h → src/3rdparty/fmt/fmt/locale.h b/src/3rdparty/fmt/locale.h → src/3rdparty/fmt/fmt/locale.h
diff --git a/src/3rdparty/fmt/os.cc → src/3rdparty/fmt/fmt/os.cc b/src/3rdparty/fmt/os.cc → src/3rdparty/fmt/fmt/os.cc
diff --git a/src/3rdparty/fmt/os.h → src/3rdparty/fmt/fmt/os.h b/src/3rdparty/fmt/os.h → src/3rdparty/fmt/fmt/os.h
diff --git a/src/3rdparty/fmt/ostream.h → src/3rdparty/fmt/fmt/ostream.h b/src/3rdparty/fmt/ostream.h → src/3rdparty/fmt/fmt/ostream.h
diff --git a/src/3rdparty/fmt/posix.h → src/3rdparty/fmt/fmt/posix.h b/src/3rdparty/fmt/posix.h → src/3rdparty/fmt/fmt/posix.h
diff --git a/src/3rdparty/fmt/printf.h → src/3rdparty/fmt/fmt/printf.h b/src/3rdparty/fmt/printf.h → src/3rdparty/fmt/fmt/printf.h
diff --git a/src/3rdparty/fmt/ranges.h → src/3rdparty/fmt/fmt/ranges.h b/src/3rdparty/fmt/ranges.h → src/3rdparty/fmt/fmt/ranges.h
diff --git a/src/backend/cpu/platform/lscpu_arm.cpp b/src/backend/cpu/platform/lscpu_arm.cpp
@@ -19,11 +19,11 @@
 
 
 #include "base/tools/String.h"
-#include "3rdparty/fmt/core.h"
 
 
 #include <cstdio>
 #include <cctype>
+#include <fmt/core.h>
 
 
 namespace xmrig {

diff --git a/src/backend/opencl/wrappers/AdlLib_linux.cpp b/src/backend/opencl/wrappers/AdlLib_linux.cpp
@@ -20,7 +20,6 @@
 
 
 #include "backend/opencl/wrappers/AdlLib.h"
-#include "3rdparty/fmt/core.h"
 #include "backend/opencl/wrappers/OclDevice.h"
 
 
@@ -31,6 +30,7 @@
 #include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <fmt/core.h>
 
 
 namespace xmrig {

diff --git a/src/base/base.cmake b/src/base/base.cmake
@@ -88,7 +88,6 @@ set(HEADERS_BASE
    )
 
 set(SOURCES_BASE
-    src/3rdparty/fmt/format.cc
     src/base/crypto/Algorithm.cpp
     src/base/crypto/Coin.cpp
     src/base/crypto/keccak.cpp

diff --git a/src/base/kernel/Process.cpp b/src/base/kernel/Process.cpp
@@ -22,10 +22,10 @@
 
 
 #include "base/kernel/Process.h"
-#include "3rdparty/fmt/core.h"
 #include "base/tools/Chrono.h"
 #include "version.h"
 
+#include <fmt/core.h>
 
 #ifdef XMRIG_OS_WIN
 #   ifdef _MSC_VER

diff --git a/src/base/net/stratum/BaseClient.cpp b/src/base/net/stratum/BaseClient.cpp
@@ -17,14 +17,15 @@
  */
 
 #include "base/net/stratum/BaseClient.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "base/io/Env.h"
 #include "base/io/log/Log.h"
 #include "base/io/log/Tags.h"
 #include "base/kernel/interfaces/IClientListener.h"
 #include "base/net/stratum/SubmitResult.h"
 
+#include <fmt/core.h>
+
 
 namespace xmrig {
 

diff --git a/src/base/net/stratum/benchmark/BenchClient.cpp b/src/base/net/stratum/benchmark/BenchClient.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "base/net/stratum/benchmark/BenchClient.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "backend/common/benchmark/BenchState.h"
 #include "backend/common/interfaces/IBackend.h"
@@ -39,6 +38,8 @@
 #   include "hw/dmi/DmiReader.h"
 #endif
 
+#include <fmt/core.h>
+
 
 xmrig::BenchClient::BenchClient(const std::shared_ptr<BenchConfig> &benchmark, IClientListener* listener) :
     m_listener(listener),

diff --git a/src/base/net/stratum/benchmark/BenchConfig.cpp b/src/base/net/stratum/benchmark/BenchConfig.cpp
@@ -17,12 +17,12 @@
  */
 
 #include "base/net/stratum/benchmark/BenchConfig.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
 
 
 #include <string>
+#include <fmt/core.h>
 
 
 #ifdef _MSC_VER

diff --git a/src/crypto/common/LinuxMemory.cpp b/src/crypto/common/LinuxMemory.cpp
@@ -17,12 +17,12 @@
  */
 
 #include "crypto/common/LinuxMemory.h"
-#include "3rdparty/fmt/core.h"
 #include "crypto/common/VirtualMemory.h"
 
 
 #include <algorithm>
 #include <fstream>
+#include <fmt/core.h>
 #include <mutex>
 #include <string>
 

diff --git a/src/hw/dmi/DmiMemory.cpp b/src/hw/dmi/DmiMemory.cpp
@@ -20,14 +20,14 @@
 
 
 #include "hw/dmi/DmiMemory.h"
-#include "3rdparty/fmt/format.h"
 #include "3rdparty/rapidjson/document.h"
 #include "hw/dmi/DmiTools.h"
 
 
 #include <algorithm>
 #include <array>
 #include <regex>
+#include <fmt/format.h>
 
 
 namespace xmrig {

diff --git a/src/hw/dmi/DmiReader.cpp b/src/hw/dmi/DmiReader.cpp
@@ -19,10 +19,11 @@
  */
 
 #include "hw/dmi/DmiReader.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "hw/dmi/DmiTools.h"
 
+#include <fmt/core.h>
+
 
 namespace xmrig {
 

diff --git a/src/hw/msr/Msr_linux.cpp b/src/hw/msr/Msr_linux.cpp
@@ -18,7 +18,6 @@
 
 
 #include "hw/msr/Msr.h"
-#include "3rdparty/fmt/core.h"
 #include "backend/cpu/Cpu.h"
 #include "base/io/log/Log.h"
 
@@ -29,6 +28,7 @@
 #include <cstdio>
 #include <dirent.h>
 #include <fcntl.h>
+#include <fmt/core.h>
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>