diff --git a/c++/triqs/CMakeLists.txt b/c++/triqs/CMakeLists.txt
index bd16298dde..8f71ac7709 100644
--- a/c++/triqs/CMakeLists.txt
+++ b/c++/triqs/CMakeLists.txt
@@ -36,7 +36,13 @@ else()
 endif()
 
 # Disable warnings about comma expression in array subscript
-target_compile_options(triqs PUBLIC -Wno-deprecated-comma-subscript -Wno-unknown-warning-option)
+target_compile_options(triqs PUBLIC
+  $<$<CXX_COMPILER_ID:GNU>:-Wno-comma-subscript>
+  $<$<CXX_COMPILER_ID:Clang>:-Wno-deprecated-comma-subscript>
+  $<$<CXX_COMPILER_ID:Clang>:-Wno-unknown-warning-option>
+  $<$<CXX_COMPILER_ID:AppleClang>:-Wno-deprecated-comma-subscript>
+  $<$<CXX_COMPILER_ID:AppleClang>:-Wno-unknown-warning-option>
+)
 
 # Compile Definitions
 option(CHECK_MEMORY "Turn on memory check" OFF)