[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-cvs
Subject:    [LyX/master] Amend 4028eefe: Make callstack printing useful and optional
From:       Kornel Benko <kornel () lyx ! org>
Date:       2019-02-26 8:47:27
Message-ID: 20190226084727.62C9928012C () lyx ! lyx ! org
[Download RAW message or body]

commit 016c7d6260441603d1b066b5d413ac27639c38a1
Author: Kornel Benko <kornel@lyx.org>
Date:   Tue Feb 26 09:50:58 2019 +0100

    Amend 4028eefe: Make callstack printing useful and optional
    
    Added the option to cmake too
---
 CMakeLists.txt                          |    1 +
 development/cmake/ConfigureChecks.cmake |    8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 965f22f..e421c53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,6 +143,7 @@ LYX_OPTION(ASAN             "Use address sanitizer" OFF ALL)
 LYX_COMBO(USE_FILEDIALOG    "Use native or QT file dialog" QT NATIVE)
 LYX_COMBO(USE_QT            "Use Qt version as frontend" AUTO QT4 QT5)
 #LYX_OPTION(3RDPARTY_BUILD   "Build 3rdparty libs" OFF ALL)
+LYX_OPTION(DISABLE_CALLSTACK_PRINTING "do not print a callstack when crashing" OFF ALL)
 LYX_OPTION(EXTERNAL_Z       "OFF := Build 3rdparty lib zlib" ON ALL)
 LYX_OPTION(EXTERNAL_ICONV   "OFF := Build 3rdparty lib iconvlib" ON ALL)
 LYX_OPTION(EXTERNAL_HUNSPELL "OFF := Build 3rdparty lib hunspelllib" ON ALL)
diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 0451f2f..5550a73 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -153,7 +153,10 @@ check_cxx_source_compiles(
 	"
 SIZEOF_LONG_LONG_GREATER_THAN_SIZEOF_LONG)
 
-check_cxx_source_compiles(
+if(LYX_DISABLE_CALLSTACK_PRINTING)
+  set(LYX_CALLSTACK_PRINTING OFF CACHE BOOL "Print callstack when crashing")
+else()
+  check_cxx_source_compiles(
 	"
 	#include <execinfo.h>
 	#include <cxxabi.h>
@@ -165,7 +168,8 @@ check_cxx_source_compiles(
 		abi::__cxa_demangle(\"abcd\", 0, 0, &status);
 	}
 	"
-LYX_CALLSTACK_PRINTING)
+  LYX_CALLSTACK_PRINTING)
+endif()
 
 # Check whether STL is libstdc++
 check_cxx_source_compiles(

[prev in list] [next in list] [prev in thread] [next in thread]