From 84705e304f61313b36f7f056fff6033fa7587588 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 12 Mar 2021 01:39:02 -0600 Subject: [PATCH] [ox] Make OX_NODEBUG a normal variable set in main CMakeLists.txt --- deps/ox/CMakeLists.txt | 4 ++++ deps/ox/src/ox/std/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/deps/ox/CMakeLists.txt b/deps/ox/CMakeLists.txt index d13b8aee..1d1c23ea 100644 --- a/deps/ox/CMakeLists.txt +++ b/deps/ox/CMakeLists.txt @@ -24,6 +24,10 @@ set(OX_BUILD_EXEC ${OX_BUILD_EXEC} CACHE BOOL "Build executables (ON/OFF)") set(OX_USE_STDLIB ${OX_USE_STDLIB} CACHE BOOL "Build libraries that need the std lib (ON/OFF)") set(OX_BARE_METAL ${OX_BARE_METAL} CACHE BOOL "Bare metal build (TRUE/FALSE)") +if(DEFINED ENV{OX_NODEBUG}) + set(OX_NODEBUG ON) +endif() + # can't run tests without building them if(NOT OX_BUILD_EXEC OR NOT OX_USE_STDLIB) set(OX_BUILD_EXEC OFF) diff --git a/deps/ox/src/ox/std/CMakeLists.txt b/deps/ox/src/ox/std/CMakeLists.txt index 3bf0e377..7d2227a5 100644 --- a/deps/ox/src/ox/std/CMakeLists.txt +++ b/deps/ox/src/ox/std/CMakeLists.txt @@ -41,7 +41,7 @@ endif() target_compile_definitions( OxStd PUBLIC $<$:OX_USE_STDLIB> - $<$:OX_NODEBUG> + $<$:OX_NODEBUG> ) target_link_libraries(