diff --git a/cmake/bgfx.cmake b/cmake/bgfx.cmake
index adc05e4..3342249 100755
--- a/cmake/bgfx.cmake
+++ b/cmake/bgfx.cmake
@@ -66,12 +66,7 @@ if( MSVC )
 endif()
 
 # Add debug config required in bx headers since bx is private
-if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-    target_compile_definitions( bgfx PUBLIC "BX_CONFIG_DEBUG=1" )
-else()
-    target_compile_definitions( bgfx PUBLIC "BX_CONFIG_DEBUG=0" )
-endif()
-
+target_compile_definitions(bgfx PUBLIC $<$<CONFIG:DEBUG>:BX_CONFIG_DEBUG=1> $<$<CONFIG:RELEASE>:BX_CONFIG_DEBUG=0>)
 
 # Includes
 target_include_directories( bgfx
diff --git a/cmake/bx.cmake b/cmake/bx.cmake
index 2b34301..1c6196d 100644
--- a/cmake/bx.cmake
+++ b/cmake/bx.cmake
@@ -67,11 +67,7 @@ target_compile_definitions( bx PUBLIC "__STDC_LIMIT_MACROS" )
 target_compile_definitions( bx PUBLIC "__STDC_FORMAT_MACROS" )
 target_compile_definitions( bx PUBLIC "__STDC_CONSTANT_MACROS" )
 
-if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-	target_compile_definitions( bx PUBLIC "BX_CONFIG_DEBUG=1" )
-else()
-	target_compile_definitions( bx PUBLIC "BX_CONFIG_DEBUG=0" )
-endif()
+target_compile_definitions(bx PUBLIC $<$<CONFIG:DEBUG>:BX_CONFIG_DEBUG=1> $<$<CONFIG:RELEASE>:BX_CONFIG_DEBUG=0>)
 
 # Additional dependencies on Unix
 if( UNIX AND NOT APPLE AND NOT ANDROID )