Skip to content
Permalink
Browse files

[all] allow disable of backtrace support during build

  • Loading branch information...
gnif committed Jun 18, 2019
1 parent d7fa0ae commit 4cf6dec592fb9b577f9f38b32fe726827b5c2dd3
Showing with 26 additions and 3 deletions.
  1. +1 −1 VERSION
  2. +3 −0 c-host/CMakeLists.txt
  3. +3 −0 client/CMakeLists.txt
  4. +7 −1 common/CMakeLists.txt
  5. +12 −1 common/src/crash.linux.c
@@ -1 +1 @@
B1-rc6-1-g2def6346e6+1
B1-rc6-2-gd7fa0aeff9+1
@@ -14,6 +14,9 @@ if(OPTIMIZE_FOR_NATIVE)
endif()
endif()

option(ENABLE_BACKTRACE "Enable backtrace support on crash" ON)
add_feature_info(ENABLE_BACKTRACE ENABLE_BACKTRACE "Backtrace support.")

add_compile_options(
"-Wall"
"-Werror"
@@ -24,6 +24,9 @@ add_feature_info(ENABLE_EGL ENABLE_EGL "EGL renderer.")
option(ENABLE_CB_X11 "Enable X11 clipboard integration" ON)
add_feature_info(ENABLE_CB_X11 ENABLE_CB_X11 "X11 Clipboard Integration.")

option(ENABLE_BACKTRACE "Enable backtrace support on crash" ON)
add_feature_info(ENABLE_BACKTRACE ENABLE_BACKTRACE "Backtrace support.")

add_compile_options(
"-Wall"
"-Werror"
@@ -5,6 +5,10 @@ include_directories(
${PROJECT_SOURCE_DIR}/include
)

if(ENABLE_BACKTRACE)
add_definitions(-DENABLE_BACKTRACE)
endif()

set(COMMON_SOURCES
src/stringutils.c
src/stringlist.c
@@ -27,7 +31,9 @@ if(WIN32)
else()
set(SOURCES ${COMMON_SOURCES} ${LINUX_SOURCES})
add_library(lg_common STATIC ${SOURCES})
target_link_libraries(lg_common bfd)
if(ENABLE_BACKTRACE)
target_link_libraries(lg_common bfd)
endif()
endif()

target_include_directories(lg_common
@@ -21,6 +21,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "common/crash.h"
#include "common/debug.h"

#if defined(ENABLE_BACKTRACE)

#include <execinfo.h>
#include <signal.h>
#include <stdio.h>
@@ -219,4 +221,13 @@ bool installCrashHandler(const char * exe)
}

return true;
}
}

#else //ENABLE_BACKTRACE

bool installCrashHandler(const char * exe)
{
return true;
}

#endif

0 comments on commit 4cf6dec

Please sign in to comment.
You can’t perform that action at this time.