diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake
index 18252c48f8..b2d7a06f9f 100644
--- a/extras/Build/CMake/JUCEUtils.cmake
+++ b/extras/Build/CMake/JUCEUtils.cmake
@@ -326,18 +326,21 @@ function(_juce_module_sources module_path output_path built_sources other_source
     set(base_path "${module_glob}/${module_glob}")
 
     set(module_cpp ${all_module_files})
-    list(FILTER module_cpp INCLUDE REGEX "^${base_path}[^/]*\\.cpp$")
+    list(FILTER module_cpp INCLUDE REGEX "^${base_path}[^/]*\\.(c|cc|cpp|cxx|s|asm)$")
 
     if(APPLE)
         set(module_mm ${all_module_files})
-        list(FILTER module_mm INCLUDE REGEX "^${base_path}[^/]*\\.(mm|r)$")
+        list(FILTER module_mm INCLUDE REGEX "^${base_path}[^/]*\\.mm$")
 
         if(module_mm)
             set(module_mm_replaced ${module_mm})
             list(TRANSFORM module_mm_replaced REPLACE "\\.mm$" ".cpp")
             list(REMOVE_ITEM module_cpp ${module_mm_replaced})
-            list(APPEND module_cpp ${module_mm})
         endif()
+
+        set(module_apple_files ${all_module_files})
+        list(FILTER module_apple_files INCLUDE REGEX "${base_path}[^/]*\\.(m|mm|metal|r|swift)$")
+        list(APPEND module_cpp ${module_apple_files})
     endif()
 
     set(headers ${all_module_files})