luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #620 from sergiud/cmake-allow-to-disable-symbolize

Browse Source 
cmake: allow to disable symbolize
This commit is contained in:
Sergiu Deitsch 2021-04-09 15:06:36 +02:00 committed by GitHub
commit 663bb26960
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -426,6 +426,11 @@ if (WITH_SYMBOLIZE)
endif (WIN32 OR CYGWIN) endif (WIN32 OR CYGWIN)
endif (WITH_SYMBOLIZE) endif (WITH_SYMBOLIZE)
# CMake manages symbolize availability. The definition is necessary only when
# building the library. Switch to add_compile_definitions once we drop support
# for CMake below version 3.12.
add_definitions (-DGLOG_NO_SYMBOLIZE_DETECTION)
check_cxx_source_compiles (" check_cxx_source_compiles ("
#include <cstdlib> #include <cstdlib>
#include <time.h> #include <time.h>

2
src/utilities.h
View File

@ -127,6 +127,7 @@
# define HAVE_STACKTRACE # define HAVE_STACKTRACE
#endif #endif
#ifndef GLOG_NO_SYMBOLIZE_DETECTION
#ifndef HAVE_SYMBOLIZE #ifndef HAVE_SYMBOLIZE
// defined by gcc // defined by gcc
#if defined(__ELF__) && defined(OS_LINUX) #if defined(__ELF__) && defined(OS_LINUX)
@ -139,6 +140,7 @@
# define HAVE_SYMBOLIZE # define HAVE_SYMBOLIZE
#endif #endif
#endif // !defined(HAVE_SYMBOLIZE) #endif // !defined(HAVE_SYMBOLIZE)
#endif // !defined(GLOG_NO_SYMBOLIZE_DETECTION)
#ifndef ARRAYSIZE #ifndef ARRAYSIZE
// There is a better way, but this is good enough for our purpose. // There is a better way, but this is good enough for our purpose.