diff --git a/intrinsiccv/CMakeLists.txt b/intrinsiccv/CMakeLists.txt
index 553f13acfd158eab75b7839649036f4829e518f9..188b61fa3d2a4d551a4d4aaeb3be2758b446769e 100644
--- a/intrinsiccv/CMakeLists.txt
+++ b/intrinsiccv/CMakeLists.txt
@@ -117,7 +117,7 @@ if (INTRINSICCV_CHECK_BANNED_FUNCTIONS)
   list(APPEND INTRINSICCV_CXX_FLAGS "SHELL:-include intrinsiccv/unsafe.h")
 endif()
 
-if (CMAKE_BUILD_TYPE EQUAL "DEBUG")
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   list(APPEND INTRINSICCV_CXX_FLAGS "-O0" "-g")
 else()
   list(APPEND INTRINSICCV_CXX_FLAGS "-O2" "-g0")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b22697f90ed85b6c1bb4fa98276dd5f7e2d66cee..b0264496ced9125f2e0e9a3be1338c93fa6eaf03 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,13 +10,19 @@ set(INTRINSICCV_INCLUDE_DIR
 )
 set(INTRINSICCV_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
-set(INTRINSICCV_WARNING_FLAGS
+set(INTRINSICCV_TEST_CXX_FLAGS
   "-Werror"
   "-Wall"
   "-Wextra"
   "-Wold-style-cast"
 )
 
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+  list(APPEND INTRINSICCV_TEST_CXX_FLAGS "-O0" "-g")
+else()
+  list(APPEND INTRINSICCV_TEST_CXX_FLAGS "-O2" "-g0")
+endif()
+
 set(INTRINSICCV_TEST_FRAMEWORK_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/framework/border.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/framework/test_main.cpp
diff --git a/test/api/CMakeLists.txt b/test/api/CMakeLists.txt
index 301715d38fa391816bc90da7afa7f3b6e08f469b..483a4fad18a3b245b63f53224932861525eb4e87 100644
--- a/test/api/CMakeLists.txt
+++ b/test/api/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND intrinsiccv_api_test_sources ${INTRINSICCV_TEST_FRAMEWORK_SOURCES})
 
 set_source_files_properties(
   ${intrinsiccv_api_test_sources}
-  PROPERTIES COMPILE_OPTIONS "-O2;${INTRINSICCV_WARNING_FLAGS}"
+  PROPERTIES COMPILE_OPTIONS "${INTRINSICCV_TEST_CXX_FLAGS}"
 )
 
 add_executable(
diff --git a/test/framework/CMakeLists.txt b/test/framework/CMakeLists.txt
index 20feeb2f8c672f440d97bb25a6544eefc2453f1f..ff60c11a6ae25082980836ab36bcf6c2e216063a 100644
--- a/test/framework/CMakeLists.txt
+++ b/test/framework/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND intrinsiccv_framework_test_sources ${INTRINSICCV_TEST_FRAMEWORK_SOUR
 
 set_source_files_properties(
   ${intrinsiccv_framework_test_sources}
-  PROPERTIES COMPILE_OPTIONS "-O2;${INTRINSICCV_WARNING_FLAGS}"
+  PROPERTIES COMPILE_OPTIONS "${INTRINSICCV_TEST_CXX_FLAGS}"
 )
 
 add_executable(