diff --git a/cmake/boardcore.cmake b/cmake/boardcore.cmake
index 309394fcfbd8a65727d0878fc11c102e9f6906cc..edb5ef8fea8950dde829c591ff98da600bea0348 100644
--- a/cmake/boardcore.cmake
+++ b/cmake/boardcore.cmake
@@ -151,7 +151,9 @@ function(add_boardcore_library BOARD_OPTIONS_FILE)
     target_include_directories(${BOARDCORE_LIB} PUBLIC ${BOARDCORE_PATH}/src/shared)
 
     # Define DEBUG when in Debug mode
-    target_compile_definitions(${BOARDCORE_LIB} PUBLIC $<$<CONFIG:Debug>:DEBUG>) 
+    target_compile_definitions(${BOARDCORE_LIB} PUBLIC $<$<CONFIG:Debug>:DEBUG>)
+    # Define NDEBUG when not in Debug mode
+    target_compile_definitions(${BOARDCORE_LIB} PUBLIC $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
 
     # Link libraries
     target_link_libraries(${BOARDCORE_LIB} PUBLIC