Skip to content

[Infrastructure] Properly adapt flags in case of ENABLE_ASSERT #18329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Oct 16, 2026
Merged

[Infrastructure] Properly adapt flags in case of ENABLE_ASSERT #18329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions dependencies/O2PhysicsCompileFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,38 @@ IF (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RELWITHDEBINFO)
ENDIF (NOT CMAKE_BUILD_TYPE)

# Adjust the per-config flags rather than replacing them. These used to be plain
# set() calls, which create normal variables that shadow the cache for the rest of
# the configure -- so whatever the build recipe passed as
# -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=... was silently discarded. alidist asks for
# "-O2 -g1 -DNDEBUG" (overridable via O2PHYSICS_DEBUG_FLAGS) and got -g anyway;
# full debug info costs ~18% of total compile time across the tree, because the
# register allocator's rewrite pass scales with the number of debug records.
# Here we only enforce what this project actually cares about: -pipe, and whether
# NDEBUG is defined. The optimisation and debug-info levels stay as given.
function(o2physics_adjust_config_flags varname want_ndebug)
set(flags "${${varname}}")
if(want_ndebug)
if(NOT flags MATCHES "(^| )-DNDEBUG($| )")
string(APPEND flags " -DNDEBUG")
endif()
else()
# ENABLE_CASSERT: the CI wants <cassert> assertions live.
string(REGEX REPLACE "(^| )-DNDEBUG($| )" " " flags "${flags}")
endif()
if(NOT flags MATCHES "(^| )-pipe($| )")
string(APPEND flags " -pipe")
endif()
string(STRIP "${flags}" flags)
set(${varname} "${flags}" PARENT_SCOPE)
endfunction()

IF(ENABLE_CASSERT) #For the CI, we want to have <cassert> assertions enabled
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -pipe")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -pipe")
o2physics_adjust_config_flags(CMAKE_CXX_FLAGS_RELEASE FALSE)
o2physics_adjust_config_flags(CMAKE_CXX_FLAGS_RELWITHDEBINFO FALSE)
ELSE()
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -pipe")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -pipe")
o2physics_adjust_config_flags(CMAKE_CXX_FLAGS_RELEASE TRUE)
o2physics_adjust_config_flags(CMAKE_CXX_FLAGS_RELWITHDEBINFO TRUE)
if (CMAKE_BUILD_TYPE STREQUAL "RELEASE" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
set(FAIR_MIN_SEVERITY "info")
endif()
Expand Down
Loading