From 890b7f5fe3125b0f4d5dc757a0b2d13d44410f41 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 25 Apr 2021 12:18:35 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20CMake:=20Fix=20fmt=20dependency?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rdParty/libfmt/CMakeLists.txt | 2 --
 CMakeLists.txt                 | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/3rdParty/libfmt/CMakeLists.txt b/3rdParty/libfmt/CMakeLists.txt
index 751ddc6fd..6116fff24 100644
--- a/3rdParty/libfmt/CMakeLists.txt
+++ b/3rdParty/libfmt/CMakeLists.txt
@@ -19,5 +19,3 @@ FetchContent_Declare(fmt
   URL_HASH MD5=70e0a0beda4bdac7debe60d380e1d802
 )
 FetchContent_MakeAvailableExcludeFromAll(fmt)
-
-set(fmt_INCLUDE_DIR ${fmt_SOURCE_DIR} PARENT_SCOPE)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6256c7a6..46f831a11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,7 +176,6 @@ if(NOT NONET)
 endif()
 
 if(DEVILUTIONX_SYSTEM_LIBFMT)
-  set(fmt_USE_STATIC_LIBS ${DEVILUTIONX_STATIC_LIBFMT})
   find_package(fmt 7.0.0 QUIET)
   if(fmt_FOUND)
     message("-- Found fmt ${fmt_VERSION}")
@@ -486,7 +485,6 @@ target_include_directories(${BIN_TARGET} PRIVATE
   3rdParty/asio/include
   3rdParty/Radon/Radon/include
   3rdParty/libsmacker
-  ${fmt_INCLUDE_DIR}/include
   ${CMAKE_CURRENT_BINARY_DIR})
 
 if(NOT N3DS)
@@ -504,7 +502,7 @@ if(NOT NONET)
   target_link_libraries(${BIN_TARGET} PRIVATE sodium)
 endif()
 
-target_link_libraries(${BIN_TARGET} PRIVATE fmt)
+target_link_libraries(${BIN_TARGET} PRIVATE fmt::fmt)
 
 genex_for_option(DEBUG)
 target_compile_definitions(${BIN_TARGET} PUBLIC "$<${DEBUG_GENEX}:_DEBUG>")