diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79f24e56..29ee1d6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,10 +145,15 @@ message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
 # ---------------------------------------------------------------------------------------
 # Static/Shared library
 # ---------------------------------------------------------------------------------------
-set(SPDLOG_SRCS src/spdlog.cpp src/stdout_sinks.cpp src/color_sinks.cpp src/file_sinks.cpp src/async.cpp src/cfg.cpp)
+file(GLOB SPDLOG_SRCS
+        src/*.cpp
+        src/details/*.cpp
+        src/sinks/*.cpp
+        src/cfg/*.cpp
+)
 
 if(NOT SPDLOG_USE_STD_FORMAT AND NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
-    list(APPEND SPDLOG_SRCS src/bundled_fmtlib_format.cpp)
+    list(APPEND SPDLOG_SRCS src/fmt/bundled_fmtlib_format.cpp)
 endif()
 
 if(SPDLOG_BUILD_SHARED OR BUILD_SHARED_LIBS)