diff --git a/CMake/CheckAndAddFlag.cmake b/CMake/CheckAndAddFlag.cmake
index 226e570833..4fe7d5be18 100644
--- a/CMake/CheckAndAddFlag.cmake
+++ b/CMake/CheckAndAddFlag.cmake
@@ -21,6 +21,8 @@ function(check_and_add_flag var flag)
   set(genexp_config_test "1")
   if(ARGV2 STREQUAL "DEBUG_ONLY")
     set(genexp_config_test "$<CONFIG:Debug>")
+  elseif(ARGV2 STREQUAL "NO_DEBINFO_ONLY")
+    set(genexp_config_test "$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>>")
   elseif(ARGV2 STREQUAL "RELEASE_ONLY")
     set(genexp_config_test "$<NOT:$<CONFIG:Debug>>")
   elseif(ARGV2)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 163ea2c943..9596373862 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -354,7 +354,7 @@ else()
   check_and_add_flag(VISIBILITY_INLINES_HIDDEN -fvisibility-inlines-hidden)
   check_and_add_flag(VISIBILITY_HIDDEN -fvisibility=hidden)
 
-  check_and_add_flag(FOMIT_FRAME_POINTER -fomit-frame-pointer RELEASE_ONLY)
+  check_and_add_flag(FOMIT_FRAME_POINTER -fomit-frame-pointer NO_DEBINFO_ONLY)
 
   dolphin_compile_definitions(_DEBUG DEBUG_ONLY)
   check_and_add_flag(GGDB -ggdb DEBUG_ONLY)