diff --git a/init_target.cmake b/init_target.cmake
index 3a4806b..fc299bb 100644
--- a/init_target.cmake
+++ b/init_target.cmake
@@ -5,7 +5,7 @@
 # https://github.com/desktop-app/legal/blob/master/LEGAL
 
 set(MAXIMUM_CXX_STANDARD cxx_std_20)
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(MAXIMUM_CXX_STANDARD cxx_std_17)
 endif()
 
diff --git a/options_mac.cmake b/options_mac.cmake
index 92d9aaa..7acd4f9 100644
--- a/options_mac.cmake
+++ b/options_mac.cmake
@@ -38,6 +38,7 @@ INTERFACE
     -Wno-sign-compare
     -Wno-unknown-attributes
     -Wno-pragma-system-header-outside-header
+    -Wno-range-loop-analysis
 )
 
 if (DESKTOP_APP_SPECIAL_TARGET)