cmake: allow to disable symbolize

google · Apr 7, 2021 · 9c7cbb9 · 9c7cbb9
1 parent e51790b
commit 9c7cbb9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -416,7 +416,7 @@ if (WITH_SYMBOLIZE)
     }
     ]=] HAVE_SYMBOLIZE)
 
-  cmake_pop_check_state ()
+    cmake_pop_check_state ()
 
     if (HAVE_SYMBOLIZE)
       set (HAVE_STACKTRACE 1)
@@ -426,6 +426,9 @@ if (WITH_SYMBOLIZE)
   endif (WIN32 OR CYGWIN)
 endif (WITH_SYMBOLIZE)
 
+# CMake manages symbolize availability
+add_compile_definitions (GLOG_NO_SYMBOLIZE_DETECTION)
+
 check_cxx_source_compiles ("
 #include <cstdlib>
 #include <time.h>

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