diff --git a/recipes/spdlog/all/conanfile.py b/recipes/spdlog/all/conanfile.py
index 5071bed3837ac..13f2d42c68b41 100644
--- a/recipes/spdlog/all/conanfile.py
+++ b/recipes/spdlog/all/conanfile.py
@@ -11,7 +11,7 @@ class SpdlogConan(ConanFile):
     homepage = "https://github.com/gabime/spdlog"
     topics = ("conan", "spdlog", "logging", "header-only")
     license = "MIT"
-    exports_sources = ["CMakeLists.txt", "patches/*"]
+    exports = ["CMakeLists.txt"]
     generators = "cmake", "cmake_find_package"
     settings = "os", "arch", "compiler", "build_type"
     options = {"shared": [True, False],
@@ -70,6 +70,7 @@ def _configure_cmake(self):
         self._cmake.definitions["SPDLOG_BUILD_TESTS_HO"] = False
         self._cmake.definitions["SPDLOG_BUILD_BENCH"] = False
         self._cmake.definitions["SPDLOG_FMT_EXTERNAL"] = True
+        self._cmake.definitions["SPDLOG_FMT_EXTERNAL_HO"] = self.options["fmt"].header_only
         self._cmake.definitions["SPDLOG_BUILD_SHARED"] = not self.options.header_only and self.options.shared
         self._cmake.definitions["SPDLOG_WCHAR_SUPPORT"] = self.options.wchar_support
         self._cmake.definitions["SPDLOG_WCHAR_FILENAMES"] = self.options.wchar_filenames
@@ -85,18 +86,20 @@ def _disable_werror(self):
 
     def build(self):
         self._disable_werror()
-        if self.options.header_only:
-            tools.patch(**self.conan_data["patches"][self.version])
-        cmake = self._configure_cmake()
-        cmake.build()
+        if not self.options.header_only:
+            cmake = self._configure_cmake()
+            cmake.build()
 
     def package(self):
         self.copy("LICENSE", dst="licenses", src=self._source_subfolder)
-        cmake = self._configure_cmake()
-        cmake.install()
-        tools.rmdir(os.path.join(self.package_folder, "lib", "cmake"))
-        tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig"))
-        tools.rmdir(os.path.join(self.package_folder, "lib", "spdlog", "cmake"))
+        if self.options.header_only:
+            self.copy(pattern="*.h", dst="include", src=os.path.join(self._source_subfolder, "include"))
+        else:
+            cmake = self._configure_cmake()
+            cmake.install()
+            tools.rmdir(os.path.join(self.package_folder, "lib", "cmake"))
+            tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig"))
+            tools.rmdir(os.path.join(self.package_folder, "lib", "spdlog", "cmake"))
 
     def package_id(self):
         if self.options.header_only:
@@ -105,15 +108,16 @@ def package_id(self):
     def package_info(self):
         if self.options.header_only:
             component_name = "spdlog_header_only"
-            self.cpp_info.components[component_name].requires = ["fmt::fmt-header-only"]
-            self.cpp_info.components["spdlog_header_only"].defines.append("SPDLOG_FMT_EXTERNAL")
         else:
             component_name = "libspdlog"
             self.cpp_info.components["libspdlog"].libs = tools.collect_libs(self)
-            self.cpp_info.components[component_name].requires = ["fmt::fmt"]
             self.cpp_info.components["libspdlog"].defines.append("SPDLOG_COMPILED_LIB")
             
         self.cpp_info.components[component_name].defines.append("SPDLOG_FMT_EXTERNAL")
+        if self.options["fmt"].header_only:
+            self.cpp_info.components[component_name].requires = ["fmt::fmt"]
+        else:
+            self.cpp_info.components[component_name].requires = ["fmt::fmt-header-only"]
         if self.options.wchar_support:
             self.cpp_info.components[component_name].defines.append("SPDLOG_WCHAR_TO_UTF8_SUPPORT")
         if self.options.wchar_filenames:
diff --git a/recipes/spdlog/all/patches/0001-header-only.patch b/recipes/spdlog/all/patches/0001-header-only.patch
deleted file mode 100644
index a2b616b57b4e9..0000000000000
--- a/recipes/spdlog/all/patches/0001-header-only.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 12320fb..756b493 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,48 +76,16 @@ find_package(Threads REQUIRED)
- 
- message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
- 
--#---------------------------------------------------------------------------------------
--# Static/Shared library (shared not supported in windows yet)
--#---------------------------------------------------------------------------------------
--set(SPDLOG_SRCS
--        src/spdlog.cpp
--        src/stdout_sinks.cpp
--        src/fmt.cpp
--        src/color_sinks.cpp
--        src/file_sinks.cpp
--        src/async.cpp)
--
--if (SPDLOG_BUILD_SHARED)
--    if(WIN32)
--        message(FATAL_ERROR "spdlog shared lib is not yet supported under windows")
--    endif()
--    add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
--else()
--    add_library(spdlog STATIC ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
--endif()
--
--add_library(spdlog::spdlog ALIAS spdlog)
--
--target_compile_definitions(spdlog PUBLIC SPDLOG_COMPILED_LIB)
--target_include_directories(spdlog PUBLIC
--        "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
--        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
--target_link_libraries(spdlog PUBLIC Threads::Threads)
--spdlog_enable_warnings(spdlog)
--
--set_target_properties(spdlog PROPERTIES VERSION ${SPDLOG_VERSION} SOVERSION ${SPDLOG_VERSION_MAJOR})
--set_target_properties(spdlog PROPERTIES DEBUG_POSTFIX d)
--
- #---------------------------------------------------------------------------------------
- # Header only version
- #---------------------------------------------------------------------------------------
--add_library(spdlog_header_only INTERFACE)
--add_library(spdlog::spdlog_header_only ALIAS spdlog_header_only)
-+add_library(spdlog INTERFACE)
-+add_library(spdlog::spdlog ALIAS spdlog)
- 
--target_include_directories(spdlog_header_only INTERFACE
-+target_include_directories(spdlog INTERFACE
-         "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
--target_link_libraries(spdlog_header_only INTERFACE Threads::Threads)
-+target_link_libraries(spdlog INTERFACE Threads::Threads)
- 
- 
- #---------------------------------------------------------------------------------------
-@@ -127,29 +95,22 @@ if(SPDLOG_FMT_EXTERNAL)
-     if (NOT TARGET fmt::fmt)
-         find_package(fmt REQUIRED)
-     endif ()
--    target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
--    target_link_libraries(spdlog PUBLIC fmt::fmt)
--
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
--    target_link_libraries(spdlog_header_only INTERFACE fmt::fmt)
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_FMT_EXTERNAL)
-+    target_link_libraries(spdlog INTERFACE fmt::fmt)
- 
-     set(PKG_CONFIG_REQUIRES fmt) # add dependecy to pkg-config
- endif()
- 
- if(SPDLOG_WCHAR_SUPPORT)
--	target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_TO_UTF8_SUPPORT)
--	target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_TO_UTF8_SUPPORT)
-+	target_compile_definitions(spdlog INTERFACE SPDLOG_WCHAR_TO_UTF8_SUPPORT)
-  endif()
- 
-  if(SPDLOG_WCHAR_FILENAMES)
--	target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_FILENAMES)
--	target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_FILENAMES)
-+	target_compile_definitions(spdlog INTERFACE SPDLOG_WCHAR_FILENAMES)
-  endif()
- 
-  if(SPDLOG_NO_EXCEPTIONS)
--	target_compile_definitions(spdlog PUBLIC SPDLOG_NO_EXCEPTIONS)	
--
--	target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_EXCEPTIONS)
-+	target_compile_definitions(spdlog INTERFACE SPDLOG_NO_EXCEPTIONS)
- 
-     if(NOT MSVC)
-         target_compile_options(spdlog PRIVATE -fno-exceptions)
-@@ -192,14 +153,9 @@ if (SPDLOG_INSTALL)
-     #---------------------------------------------------------------------------------------
-     # Include files
-     #---------------------------------------------------------------------------------------
--    install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" PATTERN "fmt/bundled" EXCLUDE)
--    install(TARGETS spdlog spdlog_header_only EXPORT spdlog DESTINATION "${CMAKE_INSTALL_LIBDIR}")
--
--    if(NOT SPDLOG_FMT_EXTERNAL)
--        install(DIRECTORY include/${PROJECT_NAME}/fmt/bundled/
--                DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/fmt/bundled/")
--    endif()
--
-+    install(TARGETS spdlog EXPORT spdlog DESTINATION "${CMAKE_INSTALL_LIBDIR}/spdlog")
-+    install(DIRECTORY include/${PROJECT_NAME}
-+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/")
-     #---------------------------------------------------------------------------------------
-     # Install pkg-config file
-     #---------------------------------------------------------------------------------------
diff --git a/recipes/spdlog/all/patches/0002-header-only.patch b/recipes/spdlog/all/patches/0002-header-only.patch
deleted file mode 100644
index d9e3a596ec5b8..0000000000000
--- a/recipes/spdlog/all/patches/0002-header-only.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 508a0b6..83fbbf2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -94,52 +94,17 @@ option(SPDLOG_NO_ATOMIC_LEVELS "prevent spdlog from using of std::atomic log lev
- 
- find_package(Threads REQUIRED)
- message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
--#---------------------------------------------------------------------------------------
--# Static/Shared library (shared not supported in windows yet)
--#---------------------------------------------------------------------------------------
--set(SPDLOG_SRCS
--        src/spdlog.cpp
--        src/stdout_sinks.cpp
--        src/color_sinks.cpp
--        src/file_sinks.cpp
--        src/async.cpp)
--
--
--if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
--    list(APPEND SPDLOG_SRCS src/fmt.cpp)
--endif()
--
--if (SPDLOG_BUILD_SHARED)
--    if(WIN32)
--        message(FATAL_ERROR "spdlog shared lib is not yet supported under windows")
--    endif()
--    add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
--else()
--    add_library(spdlog STATIC ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
--endif()
--
--add_library(spdlog::spdlog ALIAS spdlog)
--
--target_compile_definitions(spdlog PUBLIC SPDLOG_COMPILED_LIB)
--target_include_directories(spdlog PUBLIC
--        "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
--        "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
--target_link_libraries(spdlog PUBLIC Threads::Threads)
--spdlog_enable_warnings(spdlog)
--
--set_target_properties(spdlog PROPERTIES VERSION ${SPDLOG_VERSION} SOVERSION ${SPDLOG_VERSION_MAJOR})
--set_target_properties(spdlog PROPERTIES DEBUG_POSTFIX d)
- 
- #---------------------------------------------------------------------------------------
- # Header only version
- #---------------------------------------------------------------------------------------
--add_library(spdlog_header_only INTERFACE)
--add_library(spdlog::spdlog_header_only ALIAS spdlog_header_only)
-+add_library(spdlog INTERFACE)
-+add_library(spdlog::spdlog ALIAS spdlog)
- 
--target_include_directories(spdlog_header_only INTERFACE
-+target_include_directories(spdlog INTERFACE
-         "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
--target_link_libraries(spdlog_header_only INTERFACE Threads::Threads)
-+target_link_libraries(spdlog INTERFACE Threads::Threads)
- 
- 
- #---------------------------------------------------------------------------------------
-@@ -149,17 +114,8 @@ if(SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO)
-     if (NOT TARGET fmt::fmt)
-         find_package(fmt REQUIRED)
-     endif ()
--    target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
--
--    # use external fmt-header-nly
--    if(SPDLOG_FMT_EXTERNAL_HO)
--        target_link_libraries(spdlog PUBLIC fmt::fmt-header-only)
--        target_link_libraries(spdlog_header_only INTERFACE fmt::fmt-header-only)
--    else() # use external compile fmt
--        target_link_libraries(spdlog PUBLIC fmt::fmt)
--        target_link_libraries(spdlog_header_only INTERFACE fmt::fmt)
--    endif()
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_FMT_EXTERNAL)
-+    target_link_libraries(spdlog INTERFACE fmt::fmt)
- 
-     set(PKG_CONFIG_REQUIRES fmt) # add dependency to pkg-config
- endif()
-@@ -168,19 +124,15 @@ endif()
- # Misc definitions according to tweak options
- #---------------------------------------------------------------------------------------
- if(SPDLOG_WCHAR_SUPPORT)
--	target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_TO_UTF8_SUPPORT)
--	target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_TO_UTF8_SUPPORT)
-+	target_compile_definitions(spdlog INTERFACE SPDLOG_WCHAR_TO_UTF8_SUPPORT)
-  endif()
- 
-  if(SPDLOG_WCHAR_FILENAMES)
--	target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_FILENAMES)
--	target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_FILENAMES)
-+	target_compile_definitions(spdlog INTERFACE SPDLOG_WCHAR_FILENAMES)
-  endif()
- 
-  if(SPDLOG_NO_EXCEPTIONS)
--	target_compile_definitions(spdlog PUBLIC SPDLOG_NO_EXCEPTIONS)	
--
--	target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_EXCEPTIONS)
-+	target_compile_definitions(spdlog INTERFACE SPDLOG_NO_EXCEPTIONS)
- 
-     if(NOT MSVC)
-         target_compile_options(spdlog PRIVATE -fno-exceptions)
-@@ -248,13 +200,9 @@ if (SPDLOG_INSTALL)
-     #---------------------------------------------------------------------------------------
-     # Include files
-     #---------------------------------------------------------------------------------------
--    install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" PATTERN "fmt/bundled" EXCLUDE)
--    install(TARGETS spdlog spdlog_header_only EXPORT spdlog DESTINATION "${CMAKE_INSTALL_LIBDIR}")
--
--    if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
--        install(DIRECTORY include/${PROJECT_NAME}/fmt/bundled/
--                DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/fmt/bundled/")
--    endif()
-+    install(TARGETS spdlog EXPORT spdlog DESTINATION "${CMAKE_INSTALL_LIBDIR}/spdlog")
-+    install(DIRECTORY include/${PROJECT_NAME}
-+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/")
- 
-     #---------------------------------------------------------------------------------------
-     # Install pkg-config file
diff --git a/recipes/spdlog/all/patches/0003-header-only.patch b/recipes/spdlog/all/patches/0003-header-only.patch
deleted file mode 100644
index 469396f53e56b..0000000000000
--- a/recipes/spdlog/all/patches/0003-header-only.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8941df3..7bbfeed5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -122,58 +122,15 @@ endif()
- 
- find_package(Threads REQUIRED)
- message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
--# ---------------------------------------------------------------------------------------
--# Static/Shared library (shared not supported in windows yet)
--# ---------------------------------------------------------------------------------------
--set(SPDLOG_SRCS src/spdlog.cpp src/stdout_sinks.cpp src/color_sinks.cpp src/file_sinks.cpp src/async.cpp src/cfg.cpp)
--
--if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
--    list(APPEND SPDLOG_SRCS src/fmt.cpp)
--endif()
--
--if(WIN32 AND SPDLOG_BUILD_SHARED)
--    list(APPEND SPDLOG_SRCS ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
--endif()
--
--if(SPDLOG_BUILD_SHARED)
--    add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
--    target_compile_definitions(spdlog PUBLIC SPDLOG_SHARED_LIB)
--    if(WIN32)
--        target_compile_options(spdlog PUBLIC /wd4251 /wd4275)
--        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY)
--    endif()
--    if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
--        target_compile_definitions(spdlog PRIVATE FMT_EXPORT PUBLIC FMT_SHARED)
--    endif()
--else()
--    add_library(spdlog STATIC ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS})
--endif()
--
--add_library(spdlog::spdlog ALIAS spdlog)
--
--target_compile_definitions(spdlog PUBLIC SPDLOG_COMPILED_LIB)
--target_include_directories(spdlog PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
--                                         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
--target_link_libraries(spdlog PUBLIC Threads::Threads)
--spdlog_enable_warnings(spdlog)
--
--set_target_properties(spdlog PROPERTIES VERSION ${SPDLOG_VERSION} SOVERSION ${SPDLOG_VERSION_MAJOR})
--set_target_properties(spdlog PROPERTIES DEBUG_POSTFIX d)
--
--if(COMMAND target_precompile_headers AND SPDLOG_ENABLE_PCH)
--    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pch.h.in ${PROJECT_BINARY_DIR}/spdlog_pch.h @ONLY)
--    target_precompile_headers(spdlog PRIVATE ${PROJECT_BINARY_DIR}/spdlog_pch.h)
--endif()
--
- # ---------------------------------------------------------------------------------------
- # Header only version
- # ---------------------------------------------------------------------------------------
--add_library(spdlog_header_only INTERFACE)
--add_library(spdlog::spdlog_header_only ALIAS spdlog_header_only)
-+add_library(spdlog INTERFACE)
-+add_library(spdlog::spdlog ALIAS spdlog)
- 
--target_include_directories(spdlog_header_only INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-+target_include_directories(spdlog INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
-                                                         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
--target_link_libraries(spdlog_header_only INTERFACE Threads::Threads)
-+target_link_libraries(spdlog INTERFACE Threads::Threads)
- 
- # ---------------------------------------------------------------------------------------
- # Use fmt package if using external fmt
-@@ -182,18 +139,9 @@ if(SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO)
-     if(NOT TARGET fmt::fmt)
-         find_package(fmt 5.3.0 REQUIRED)
-     endif()
--    target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
--
--    # use external fmt-header-nly
--    if(SPDLOG_FMT_EXTERNAL_HO)
--        target_link_libraries(spdlog PUBLIC fmt::fmt-header-only)
--        target_link_libraries(spdlog_header_only INTERFACE fmt::fmt-header-only)
--    else() # use external compile fmt
--        target_link_libraries(spdlog PUBLIC fmt::fmt)
--        target_link_libraries(spdlog_header_only INTERFACE fmt::fmt)
--    endif()
--
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_FMT_EXTERNAL)
-+    target_link_libraries(spdlog INTERFACE fmt::fmt)
-+    
-     set(PKG_CONFIG_REQUIRES fmt) # add dependency to pkg-config
- endif()
- 
-@@ -201,19 +149,15 @@ endif()
- # Misc definitions according to tweak options
- # ---------------------------------------------------------------------------------------
- if(SPDLOG_WCHAR_SUPPORT)
--    target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_TO_UTF8_SUPPORT)
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_TO_UTF8_SUPPORT)
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_WCHAR_TO_UTF8_SUPPORT)
- endif()
- 
- if(SPDLOG_WCHAR_FILENAMES)
--    target_compile_definitions(spdlog PUBLIC SPDLOG_WCHAR_FILENAMES)
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_WCHAR_FILENAMES)
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_WCHAR_FILENAMES)
- endif()
- 
- if(SPDLOG_NO_EXCEPTIONS)
--    target_compile_definitions(spdlog PUBLIC SPDLOG_NO_EXCEPTIONS)
--
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_EXCEPTIONS)
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_NO_EXCEPTIONS)
- 
-     if(NOT MSVC)
-         target_compile_options(spdlog PRIVATE -fno-exceptions)
-@@ -221,28 +165,23 @@ if(SPDLOG_NO_EXCEPTIONS)
- endif()
- 
- if(SPDLOG_CLOCK_COARSE)
--    target_compile_definitions(spdlog PRIVATE SPDLOG_CLOCK_COARSE)
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_CLOCK_COARSE)
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_CLOCK_COARSE)
- endif()
- 
- if(SPDLOG_PREVENT_CHILD_FD)
--    target_compile_definitions(spdlog PRIVATE SPDLOG_PREVENT_CHILD_FD)
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_PREVENT_CHILD_FD)
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_PREVENT_CHILD_FD)
- endif()
- 
- if(SPDLOG_NO_THREAD_ID)
--    target_compile_definitions(spdlog PRIVATE SPDLOG_NO_THREAD_ID)
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_THREAD_ID)
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_NO_THREAD_ID)
- endif()
- 
- if(SPDLOG_NO_TLS)
--    target_compile_definitions(spdlog PRIVATE SPDLOG_NO_TLS)
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_TLS)
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_NO_TLS)
- endif()
- 
- if(SPDLOG_NO_ATOMIC_LEVELS)
--    target_compile_definitions(spdlog PUBLIC SPDLOG_NO_ATOMIC_LEVELS)
--    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_NO_ATOMIC_LEVELS)
-+    target_compile_definitions(spdlog INTERFACE SPDLOG_NO_ATOMIC_LEVELS)
- endif()
- 
- # ---------------------------------------------------------------------------------------
-@@ -284,18 +223,9 @@ if(SPDLOG_INSTALL)
-     # ---------------------------------------------------------------------------------------
-     # Include files
-     # ---------------------------------------------------------------------------------------
--    install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" PATTERN "fmt/bundled" EXCLUDE)
--    install(
--        TARGETS spdlog spdlog_header_only
--        EXPORT spdlog
--        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--
--    if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
--        install(DIRECTORY include/${PROJECT_NAME}/fmt/bundled/
--                DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/fmt/bundled/")
--    endif()
-+    install(TARGETS spdlog EXPORT spdlog DESTINATION "${CMAKE_INSTALL_LIBDIR}/spdlog")
-+    install(DIRECTORY include/${PROJECT_NAME}
-+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/")
- 
-     # ---------------------------------------------------------------------------------------
-     # Install pkg-config file