diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index a88d1205317d56e0d642216b415c41616c93b6e5..eb50838ae8d70b5c9d4fdff7fcddbc40a559d198 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -1,7 +1,9 @@
-
 #---------------------------------------------------------------------------------------------------
-##SET( CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -pedantic -Wno-long-long")
-SET( CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Wno-long-long")
+if(DD4HEP_USE_CXX11)
+  SET( CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -pedantic -Wno-long-long -Wdeprecated -Wformat-security -Wshadow")
+else()
+  SET( CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Wno-long-long")
+endif()
 
 add_definitions(-DBOOST_SPIRIT_USE_PHOENIX_V3)