at 24.11-pre 1.8 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 5e4af80..a54eecb 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -1,6 +1,9 @@ 6 # Copyright (C) 2020-2024 Intel Corporation 7 # SPDX-License-Identifier: MIT 8 9+add_compile_definitions(SPDLOG_FMT_EXTERNAL) 10+add_compile_definitions(FMT_HEADER_ONLY) 11+ 12 cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR) 13 set(CMAKE_CXX_STANDARD 14) 14 set(CMAKE_CXX_STANDARD_REQUIRED ON) 15@@ -58,7 +60,7 @@ elseif(Git_FOUND) 16 endif() 17 18 include(FetchContent) 19-set(SPDLOG_ROOT "${FETCHCONTENT_BASE_DIR}/spdlog-src") 20+set(SPDLOG_ROOT "@spdlog@") 21 22 # Update other relevant variables to include the patch 23 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") 24diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt 25index cb6cfb1..599338a 100644 26--- a/source/utils/CMakeLists.txt 27+++ b/source/utils/CMakeLists.txt 28@@ -1,16 +1,6 @@ 29 # Copyright (C) 2024 Intel Corporation 30 # SPDX-License-Identifier: MIT 31 32-include(FetchContent) 33-set(SPDLOG_REPO https://github.com/gabime/spdlog) 34-set(SPDLOG_TAG v1.13.0) 35-FetchContent_Declare( 36- spdlog 37- GIT_REPOSITORY ${SPDLOG_REPO} 38- GIT_TAG ${SPDLOG_TAG} 39-) 40-FetchContent_makeAvailable(spdlog) 41- 42 add_library(utils 43 STATIC 44 "logging.h" 45@@ -19,5 +9,5 @@ add_library(utils 46 47 target_include_directories(utils 48 PUBLIC 49- ${FETCHCONTENT_BASE_DIR}/spdlog-src/include 50+ @spdlog@/include 51 ) 52diff --git a/source/utils/logging.h b/source/utils/logging.h 53index 4aad451..c8c4cc3 100644 54--- a/source/utils/logging.h 55+++ b/source/utils/logging.h 56@@ -16,8 +16,8 @@ 57 #include <string> 58 #include <vector> 59 60-#include "spdlog/sinks/basic_file_sink.h" 61-#include "spdlog/spdlog.h" 62+#include <spdlog/sinks/basic_file_sink.h> 63+#include <spdlog/spdlog.h> 64 65 namespace loader { 66