aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Tismer <tismer@stackless.com>2021-09-06 11:24:46 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-06 14:16:25 +0000
commit1ae261182543492b641df00ce9ed1e131afd3c07 (patch)
tree3ef844b60696eb94d2786b98ac6b36bea926aa6e
parent7fab278fcd42dd1f2d748f0f9538679801955e5d (diff)
cmake: Fix option --sanitize-address, take two
Fix the macro name, amending 4d63dfffb661115f58cca60c80c4649ba982e01b. This was actually discovered by PyPy bug hunting. Change-Id: Ic71ecf07dc3e03d23fa505d8a3fad3f7b933c354 Task-number: PYSIDE-1655 Task-number: PYSIDE-1033 Task-number: PYSIDE-535 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit df81513945fd40c3ce6b28605ba656f35c814602) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/shiboken6/CMakeLists.txt2
-rw-r--r--sources/shiboken6/data/shiboken_helpers.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken6/CMakeLists.txt b/sources/shiboken6/CMakeLists.txt
index 07eabd635..09216d042 100644
--- a/sources/shiboken6/CMakeLists.txt
+++ b/sources/shiboken6/CMakeLists.txt
@@ -133,7 +133,7 @@ endif()
# Build with Address sanitizer enabled if requested.
# This may break things, so use at your own risk.
if (SANITIZE_ADDRESS AND NOT MSVC)
- set_sanitize_address()
+ setup_sanitize_address()
endif()
# Detect if the python libs were compiled in debug mode
diff --git a/sources/shiboken6/data/shiboken_helpers.cmake b/sources/shiboken6/data/shiboken_helpers.cmake
index 4b74f4f9b..7b81abb65 100644
--- a/sources/shiboken6/data/shiboken_helpers.cmake
+++ b/sources/shiboken6/data/shiboken_helpers.cmake
@@ -29,7 +29,7 @@ macro(set_debug_build)
endif()
endmacro()
-macro(set_sanitize_address)
+macro(setup_sanitize_address)
# Currently this does not check that the clang / gcc version used supports Address sanitizer,
# so once again, use at your own risk.
add_compile_options("-fsanitize=address" "-g" "-fno-omit-frame-pointer")