commit 5529172fa1ac49e8adf11dcc27b49f1aa74a66c3
Author: Kornel Benko <[email protected]>
Date:   Wed Jul 15 14:24:49 2020 +0200

    Cmake build: Re-enable address sanitizer
    
    Moved code because:
    1.) Setting of LYX_CXX_FLAGS only has no effect,
    2.) and setting of CMAKE_CXX_FLAGS was to late.
---
 CMakeLists.txt |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b16a258..5f62452 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -711,6 +711,16 @@ else()
        endif()
 endif()
 
+if(LYX_ASAN)
+    set(CMAKE_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -g 
${CMAKE_CXX_FLAGS}")
+    message(STATUS)
+    message(STATUS "Address sanitizer enabled. Usage:")
+    message(STATUS "    wget 
https://llvm.org/svn/llvm-project/compiler-rt/trunk/lib/asan/scripts/asan_symbolize.py";)
+    message(STATUS "    chmod  +x ./asan_symbolize.py")
+    message(STATUS "    ./bin/${_lyx} 2>&1 | ./asan_symbolize.py  | c++filt ")
+    message(STATUS)
+endif()
+
 set(LYX_CXX_FLAGS_EXTRA "" CACHE STRING "Desired semicolon separated list of 
extra cxx compile flags, like '-Werror'")
 mark_as_advanced(LYX_CXX_FLAGS_EXTRA)
 if(LYX_CXX_FLAGS_EXTRA)
@@ -1168,16 +1178,6 @@ endif ()
 add_custom_target (lyx_run_tests COMMAND ${cmd})
 set_target_properties(lyx_run_tests PROPERTIES FOLDER "tests")
 
-if(LYX_ASAN)
-    set(LYX_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -g")
-    message(STATUS)
-    message(STATUS "Address sanitizer enabled. Usage:")
-    message(STATUS "    wget 
https://llvm.org/svn/llvm-project/compiler-rt/trunk/lib/asan/scripts/asan_symbolize.py";)
-    message(STATUS "    chmod  +x ./asan_symbolize.py")
-    message(STATUS "    ./bin/lyx2.2 2>&1 | ./asan_symbolize.py  | c++filt ")
-    message(STATUS)
-endif()
-
 if(LYX_INSTALL)
        if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
                message(STATUS "Python required to create doc!")
-- 
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs

Reply via email to