diff --git a/tools/lib/run-cmake-configure.sh b/tools/lib/run-cmake-configure.sh index ffe9e7f8..5e1a3bbf 100755 --- a/tools/lib/run-cmake-configure.sh +++ b/tools/lib/run-cmake-configure.sh @@ -10,7 +10,7 @@ cmake_args=( -DCONAN_HOST_PROFILE="${conan_profile}" -DCONAN_BUILD_PROFILE="${conan_profile}" -DSCWX_VIRTUAL_ENV="${venv_path}" - -DCMAKE_EXPORT_COMPILE_COMMANDS=on + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ) if [[ -n "${build_type}" ]]; then @@ -27,5 +27,16 @@ else ) fi +# Toggle address sanitizer based on argument +if [ "${address_sanitizer}" != "disabled" ]; then + cmake_args+=( + -DSCWX_ADDRESS_SANITIZER=ON + ) +else + cmake_args+=( + -DSCWX_ADDRESS_SANITIZER=OFF + ) +fi + mkdir -p "${build_dir}" cmake "${cmake_args[@]}" diff --git a/tools/setup-debug.sh b/tools/setup-debug.sh index ebfba62c..9b896d40 100755 --- a/tools/setup-debug.sh +++ b/tools/setup-debug.sh @@ -7,6 +7,7 @@ export conan_profile=${2:-scwx-linux_gcc-11} export generator=Ninja export qt_base=/opt/Qt export qt_arch=gcc_64 +export address_sanitizer=${4:-disabled} # Assign user-specified Python Virtual Environment [ "${3:-}" = "none" ] && unset venv_path || export venv_path="$(readlink -f "${3:-${script_dir}/../.venv}")" diff --git a/tools/setup-release.sh b/tools/setup-release.sh index c89fdfe5..e7e10db0 100755 --- a/tools/setup-release.sh +++ b/tools/setup-release.sh @@ -7,6 +7,7 @@ export conan_profile=${2:-scwx-linux_gcc-11} export generator=Ninja export qt_base=/opt/Qt export qt_arch=gcc_64 +export address_sanitizer=${4:-disabled} # Assign user-specified Python Virtual Environment [ "${3:-}" = "none" ] && unset venv_path || export venv_path="$(readlink -f "${3:-${script_dir}/../.venv}")"