Merge branch 'develop' into feature/placefiles

This commit is contained in:
Dan Paulat 2023-09-16 00:11:55 -05:00
commit 1997d09f29
12 changed files with 65 additions and 12 deletions

View file

@ -443,6 +443,21 @@ target_compile_options(supercell-wx PRIVATE
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
)
# Address Sanitizer options
if (SCWX_ADDRESS_SANITIZER)
target_compile_options(scwx-qt PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fsanitize=address -fsanitize-recover=address>
)
target_compile_options(supercell-wx PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fsanitize=address -fsanitize-recover=address>
)
target_link_options(supercell-wx PRIVATE
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fsanitize=address>
)
endif()
if (MSVC)
# Produce PDB file for debug
target_compile_options(scwx-qt PRIVATE "$<$<CONFIG:Release>:/Zi>")