diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake
index a61b58a2..50f16221 100644
--- a/build/CompilerAndLinker.cmake
+++ b/build/CompilerAndLinker.cmake
@@ -119,6 +119,14 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")
     if(WINDOWS_STORE)
       list(APPEND COMPILER_DEFINES _SILENCE_CLANG_COROUTINE_MESSAGE)
     endif()
+
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0)
+      list(APPEND COMPILER_SWITCHES -Wc++20-compat)
+    endif()
+
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.0)
+      list(APPEND COMPILER_SWITCHES -Wc++23-compat)
+    endif()
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     list(APPEND COMPILER_SWITCHES /Zc:__cplusplus /Zc:inline /fp:fast /Qdiag-disable:161)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")