Use the fmt inside spdlog if using spdlog

Author: zfergus

CMakeLists.txt

@@ -183,17 +183,17 @@ if(KOMPUTE_OPT_USE_SPDLOG)
     else()
         find_package(spdlog REQUIRED)
     endif()
-endif()
-
-# fmt
-if(KOMPUTE_OPT_USE_BUILT_IN_FMT)
-    set(FMT_INSTALL ${KOMPUTE_OPT_INSTALL})
-    FetchContent_Declare(fmt GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-        GIT_TAG 11.0.0
-        GIT_SHALLOW 1) # Source: https://github.com/fmtlib/fmt/releases
-    FetchContent_MakeAvailable(fmt)
 else()
-    find_package(fmt REQUIRED)
+    # fmt
+    if(KOMPUTE_OPT_USE_BUILT_IN_FMT)
+        set(FMT_INSTALL ${KOMPUTE_OPT_INSTALL})
+        FetchContent_Declare(fmt GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+            GIT_TAG 11.0.0
+            GIT_SHALLOW 1) # Source: https://github.com/fmtlib/fmt/releases
+        FetchContent_MakeAvailable(fmt)
+    else()
+        find_package(fmt REQUIRED)
+    endif()
 endif()
 
 # GoogleTest

src/CMakeLists.txt

@@ -67,13 +67,11 @@ if(KOMPUTE_OPT_ANDROID_BUILD)
     target_link_libraries(kompute PUBLIC vulkanAndroid
         android
         kp_logger
-        kp_shader
-        fmt::fmt)
+        kp_shader)
 else()
     target_link_libraries(kompute PUBLIC Vulkan::Vulkan
         kp_logger
-        kp_shader
-        fmt::fmt)
+        kp_shader)
 endif()
 
 if(KOMPUTE_OPT_BUILD_PYTHON)
@@ -94,7 +92,7 @@ add_subdirectory(shaders)
 add_subdirectory(include)
 
 if(KOMPUTE_OPT_INSTALL)
-    if (KOMPUTE_OPT_USE_BUILT_IN_FMT)
+    if (NOT KOMPUTE_OPT_USE_SPDLOG AND KOMPUTE_OPT_USE_BUILT_IN_FMT)
         # We can't export fmt::fmt because it's alias target, so we unwrap the alias and install it.
         get_target_property(fmt_aliased_target fmt::fmt ALIASED_TARGET)
         install(TARGETS ${fmt_aliased_target}

src/Manager.cpp

@@ -2,8 +2,13 @@
 
 #include "kompute/Manager.hpp"
 #include "kompute/logger/Logger.hpp"
+#if KOMPUTE_OPT_USE_SPDLOG
+#include <spdlog/fmt/fmt.h>
+#include <spdlog/fmt/ranges.h>
+#else
 #include <fmt/core.h>
 #include <fmt/ranges.h>
+#endif
 #include <iterator>
 #include <set>
 #include <sstream>

src/Memory.cpp

@@ -3,7 +3,11 @@
 #include "kompute/Memory.hpp"
 #include "kompute/Image.hpp"
 #include "kompute/Tensor.hpp"
+#if KOMPUTE_OPT_USE_SPDLOG
+#include <spdlog/fmt/fmt.h>
+#else
 #include <fmt/core.h>
+#endif
 
 namespace kp {
 

src/include/kompute/Algorithm.hpp

@@ -3,7 +3,12 @@
 
 #include "kompute/Core.hpp"
 
-#include "fmt/format.h"
+#if KOMPUTE_OPT_USE_SPDLOG
+#include <spdlog/fmt/fmt.h>
+#else
+#include <fmt/format.h>
+#endif
+
 #include "kompute/Tensor.hpp"
 #include "logger/Logger.hpp"