Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 06:47:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[all] allow disable of backtrace support during build

Browse Source
This commit is contained in:
Geoffrey McRae 2019-06-19 09:13:03 +10:00
parent d7fa0aeff9
commit 4cf6dec592
5 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
B1-rc6-1-g2def6346e6+1 B1-rc6-2-gd7fa0aeff9+1

3
c-host/CMakeLists.txt
View File

@ -14,6 +14,9 @@ if(OPTIMIZE_FOR_NATIVE)
endif() endif()
endif() endif()
option(ENABLE_BACKTRACE "Enable backtrace support on crash" ON)
add_feature_info(ENABLE_BACKTRACE ENABLE_BACKTRACE "Backtrace support.")
add_compile_options( add_compile_options(
"-Wall" "-Wall"
"-Werror" "-Werror"

3
client/CMakeLists.txt
View File

@ -24,6 +24,9 @@ add_feature_info(ENABLE_EGL ENABLE_EGL "EGL renderer.")
option(ENABLE_CB_X11 "Enable X11 clipboard integration" ON) option(ENABLE_CB_X11 "Enable X11 clipboard integration" ON)
add_feature_info(ENABLE_CB_X11 ENABLE_CB_X11 "X11 Clipboard Integration.") 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( add_compile_options(
"-Wall" "-Wall"
"-Werror" "-Werror"

6
common/CMakeLists.txt
View File

@ -5,6 +5,10 @@ include_directories(
${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/include
) )
if(ENABLE_BACKTRACE)
add_definitions(-DENABLE_BACKTRACE)
endif()
set(COMMON_SOURCES set(COMMON_SOURCES
src/stringutils.c src/stringutils.c
src/stringlist.c src/stringlist.c
@ -27,7 +31,9 @@ if(WIN32)
else() else()
set(SOURCES ${COMMON_SOURCES} ${LINUX_SOURCES}) set(SOURCES ${COMMON_SOURCES} ${LINUX_SOURCES})
add_library(lg_common STATIC ${SOURCES}) add_library(lg_common STATIC ${SOURCES})
if(ENABLE_BACKTRACE)
target_link_libraries(lg_common bfd) target_link_libraries(lg_common bfd)
endif()
endif() endif()
target_include_directories(lg_common target_include_directories(lg_common

11
common/src/crash.linux.c
View File

@ -21,6 +21,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "common/crash.h" #include "common/crash.h"
#include "common/debug.h" #include "common/debug.h"
#if defined(ENABLE_BACKTRACE)
#include <execinfo.h> #include <execinfo.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@ -220,3 +222,12 @@ bool installCrashHandler(const char * exe)
return true; return true;
} }
#else //ENABLE_BACKTRACE
bool installCrashHandler(const char * exe)
{
return true;
}
#endif