diff --git a/cmake/CompilerDetect.cmake b/cmake/CompilerDetect.cmake
index b2492584e..2f86539a4 100644
--- a/cmake/CompilerDetect.cmake
+++ b/cmake/CompilerDetect.cmake
@@ -1,6 +1,3 @@
-if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  set(CMAKE_COMPILER_IS_CLANG 1)
-endif()
-if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" OR CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
+if(CMAKE_C_COMPILER_ID MATCHES ".*Clang.*" OR CMAKE_CXX_COMPILER_ID MATCHES ".*Clang.*")
   set(CMAKE_COMPILER_IS_CLANG 1)
 endif()