diff --git a/compiler_flags/Clang.C.cmake b/compiler_flags/Clang.C.cmake
index 56d2142..ef1483e 100644
--- a/compiler_flags/Clang.C.cmake
+++ b/compiler_flags/Clang.C.cmake
@@ -1,5 +1,5 @@
 if(CMAKE_C_COMPILER_ID MATCHES Clang)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
-    set(CMAKE_C_FLAGS_RELEASE "-O2 -Wno-unused")
-    set(CMAKE_C_FLAGS_DEBUG "-O0")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+    set(CMAKE_C_FLAGS_RELEASE "-O3 -Wno-unused")
+    set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 endif()
diff --git a/compiler_flags/Clang.CXX.cmake b/compiler_flags/Clang.CXX.cmake
index 3e2d9ba..a2699a1 100644
--- a/compiler_flags/Clang.CXX.cmake
+++ b/compiler_flags/Clang.CXX.cmake
@@ -1,5 +1,5 @@
 if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wno-unknown-pragmas -Wno-sign-compare -Woverloaded-virtual -Wwrite-strings -Wno-unused")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -Wno-sign-compare -Woverloaded-virtual -Wwrite-strings -Wno-unused")
     set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -march=native -DNDEBUG -Wno-unused")
-    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG")
+    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -g")
 endif()
diff --git a/compiler_flags/GNU.C.cmake b/compiler_flags/GNU.C.cmake
index ba295cd..ce8384c 100644
--- a/compiler_flags/GNU.C.cmake
+++ b/compiler_flags/GNU.C.cmake
@@ -1,5 +1,5 @@
 if(CMAKE_C_COMPILER_ID MATCHES GNU)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
-    set(CMAKE_C_FLAGS_RELEASE "-O2 -Wno-unused")
-    set(CMAKE_C_FLAGS_DEBUG "-O0")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+    set(CMAKE_C_FLAGS_RELEASE "-O3 -Wno-unused")
+    set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 endif()
diff --git a/compiler_flags/GNU.CXX.cmake b/compiler_flags/GNU.CXX.cmake
index 510b2d9..3662746 100644
--- a/compiler_flags/GNU.CXX.cmake
+++ b/compiler_flags/GNU.CXX.cmake
@@ -1,5 +1,5 @@
 if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wno-unknown-pragmas -Wno-sign-compare -Woverloaded-virtual -Wwrite-strings -Wno-unused")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -Wno-sign-compare -Woverloaded-virtual -Wwrite-strings -Wno-unused")
     set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -march=native -DNDEBUG -Wno-unused")
-    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG")
+    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -g")
 endif()
diff --git a/compiler_flags/GNU.Fortran.cmake b/compiler_flags/GNU.Fortran.cmake
index ce9df69..9602b22 100644
--- a/compiler_flags/GNU.Fortran.cmake
+++ b/compiler_flags/GNU.Fortran.cmake
@@ -1,5 +1,5 @@
 if(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
     set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -funroll-all-loops -w")
-    set(CMAKE_Fortran_FLAGS_DEBUG "-O0")
+    set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -fbacktrace")
 endif()
diff --git a/compiler_flags/Intel.C.cmake b/compiler_flags/Intel.C.cmake
index 9931140..b2c1847 100644
--- a/compiler_flags/Intel.C.cmake
+++ b/compiler_flags/Intel.C.cmake
@@ -1,5 +1,5 @@
 if(CMAKE_C_COMPILER_ID MATCHES Intel)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
     set(CMAKE_C_FLAGS_RELEASE "-O3")
-    set(CMAKE_C_FLAGS_DEBUG "-O0")
+    set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 endif()
diff --git a/compiler_flags/Intel.Fortran.cmake b/compiler_flags/Intel.Fortran.cmake
index 2d857a7..9d753c0 100644
--- a/compiler_flags/Intel.Fortran.cmake
+++ b/compiler_flags/Intel.Fortran.cmake
@@ -1,5 +1,5 @@
 if(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -w -assume byterecl -g -traceback")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -w -assume byterecl")
     set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -ip")
-    set(CMAKE_Fortran_FLAGS_DEBUG "-O0")
+    set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -traceback")
 endif()
diff --git a/compiler_flags/PGI.C.cmake b/compiler_flags/PGI.C.cmake
index 552dd7d..8f7e460 100644
--- a/compiler_flags/PGI.C.cmake
+++ b/compiler_flags/PGI.C.cmake
@@ -1,5 +1,5 @@
 if(CMAKE_C_COMPILER_ID MATCHES PGI)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
     set(CMAKE_C_FLAGS_RELEASE "-O3")
-    set(CMAKE_C_FLAGS_DEBUG "-O0")
+    set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 endif()
diff --git a/compiler_flags/PGI.CXX.cmake b/compiler_flags/PGI.CXX.cmake
index fd014e6..09815be 100644
--- a/compiler_flags/PGI.CXX.cmake
+++ b/compiler_flags/PGI.CXX.cmake
@@ -1,5 +1,5 @@
 if(CMAKE_CXX_COMPILER_ID MATCHES PGI)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
     set(CMAKE_CXX_FLAGS_RELEASE "-O3")
-    set(CMAKE_CXX_FLAGS_DEBUG "-O0")
+    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 endif()
diff --git a/compiler_flags/XL.CXX.cmake b/compiler_flags/XL.CXX.cmake
index 6dad9c8..69f974f 100644
--- a/compiler_flags/XL.CXX.cmake
+++ b/compiler_flags/XL.CXX.cmake
@@ -1,5 +1,5 @@
 if(CMAKE_CXX_COMPILER_ID MATCHES XL)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
     set(CMAKE_CXX_FLAGS_RELEASE "-O3")
-    set(CMAKE_CXX_FLAGS_DEBUG "-O0")
+    set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 endif()