Merge pull request #671 from sergiud/cmake-define-have-cxx11-atomic

cmake: export `<atomic>` availability (fixes #667)
google · Jun 16, 2021 · a4a725d · a4a725d
2 parents 44331dc + d25a1b7
commit a4a725d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -399,6 +399,12 @@ if (HAVE_EXECINFO_H)
   set (HAVE_STACKTRACE 1)
 endif (HAVE_EXECINFO_H)
 
+if (HAVE_CXX11_ATOMIC)
+  set (ac_cv_cxx11_atomic 1)
+else (HAVE_CXX11_ATOMIC)
+  set (ac_cv_cxx11_atomic 0)
+endif (HAVE_CXX11_ATOMIC)
+
 if (WITH_SYMBOLIZE)
   if (WIN32 OR CYGWIN)
     cmake_push_check_state (RESET)

diff --git a/bazel/glog.bzl b/bazel/glog.bzl
@@ -187,6 +187,7 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
     )
 
     common_config = {
+        "@ac_cv_cxx11_atomic@": "1",
         "@ac_cv_cxx11_nullptr_t@": "1",
         "@ac_cv_cxx_using_operator@": "1",
         "@ac_cv_have_inttypes_h@": "0",

diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
@@ -99,7 +99,7 @@
 #include <gflags/gflags.h>
 #endif
 
-#ifdef HAVE_CXX11_ATOMIC
+#if @ac_cv_cxx11_atomic@
 #include <atomic>
 #elif defined(OS_WINDOWS)
 #include <Windows.h>