From 07683c1f0da587d1c00e377e29fda2c78540848f Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sun, 9 Nov 2014 12:59:14 +0100 Subject: [PATCH] Cmake build: 'callstack printing' detection. Instead of depending on compiler we try to check for working API as is done now for automake build too. --- development/cmake/ConfigureChecks.cmake | 14 ++++++++++++++ development/cmake/config.h.cmake | 3 +++ src/support/CMakeLists.txt | 4 ---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake index 2bdc605abd..1c0215eeca 100644 --- a/development/cmake/ConfigureChecks.cmake +++ b/development/cmake/ConfigureChecks.cmake @@ -112,6 +112,20 @@ check_cxx_source_compiles( " SIZEOF_WCHAR_T_IS_4) +check_cxx_source_compiles( + " + #include + #include + int main() { + void* array[200]; + size_t size = backtrace(array, 200); + backtrace_symbols(array, size); + int status = 0; + abi::__cxa_demangle(\"abcd\", 0, 0, &status); + } + " +LYX_CALLSTACK_PRINTING) + if(LYX_USE_QT MATCHES "QT5") if (Qt5X11Extras_FOUND) get_target_property(_x11extra_prop Qt5::X11Extras IMPORTED_CONFIGURATIONS) diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake index 3068c10e8e..51d97b1d4b 100644 --- a/development/cmake/config.h.cmake +++ b/development/cmake/config.h.cmake @@ -57,6 +57,9 @@ #cmakedefine LYX_USE_TR1 1 #cmakedefine LYX_USE_TR1_REGEX 1 +// Define if callstack can be printed +#cmakedefine LYX_CALLSTACK_PRINTING 1 + #cmakedefine Z_PREFIX 1 ${Include_used_spellchecker} diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt index 4a018e8cce..b0d1c6db20 100644 --- a/src/support/CMakeLists.txt +++ b/src/support/CMakeLists.txt @@ -41,10 +41,6 @@ else() set(support_linkback_headers "") endif() -if(UNIX AND CMAKE_COMPILER_IS_GNUCC AND NOT APPLE) - add_definitions(-DLYX_CALLSTACK_PRINTING) -endif() - add_subdirectory(tests) # needed to compile tex2lyx in merged mode -- 2.39.5