From ba9f312cee3f4f64d56c6bdd1a32f240256bcdb7 Mon Sep 17 00:00:00 2001 From: Alphagocc Date: Mon, 17 Jun 2024 13:10:43 +0800 Subject: [PATCH] fix(dependencies): refactor spdlog dependency handling --- CMakeLists.txt | 10 +++------- makespec/BUILDVERSION | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b9141f..9dad50b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,14 +71,10 @@ set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleAp add_subdirectory(3rdparty/SingleApplication) # spdlog -find_package(spdlog QUIET) add_compile_definitions(SPDLOG_COMPILED_LIB) -if (NOT spdlog_FOUND) - message("Could NOT Find system spdlog") - message("Use 3rdparty spdlog") - set(spdlog_DIR ${CMAKE_SOURCE_DIR}/3rdparty/spdlog) - add_subdirectory(3rdparty/spdlog) -endif() +add_compile_definitions(SPDLOG_BUILD_SHARED=OFF) +set(spdlog_DIR ${CMAKE_SOURCE_DIR}/3rdparty/spdlog) +add_subdirectory(3rdparty/spdlog) if(WIN32) add_compile_options("/std:c++17") diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index 8c9cf7e..98ecf58 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -258 +259