diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99ec5830e..38b52f449 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,8 +237,10 @@ endif()
 
 # Handle debugmode compiles (this will require further work for proper WIN32-setups)
 if(UNIX)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  
+  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+  endif()
+
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
 endif()