From 56e7bdf27832b45f389e8a5af958f772d90d02d8 Mon Sep 17 00:00:00 2001 From: Ben Bader Date: Mon, 8 Jul 2019 11:13:53 -0700 Subject: [PATCH] Fix builtin_atomics check in CMakeLists.txt --- cmake/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 0484e362ec..f87b0928e0 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -137,6 +137,8 @@ endif (HAVE_ZLIB) set(protobuf_LINK_LIBATOMIC false) if (NOT MSVC) include(CheckCXXSourceCompiles) + set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) + set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -std=c++11) check_cxx_source_compiles(" #include int main() { @@ -146,6 +148,7 @@ if (NOT MSVC) if (NOT protobuf_HAVE_BUILTIN_ATOMICS) set(protobuf_LINK_LIBATOMIC true) endif (NOT protobuf_HAVE_BUILTIN_ATOMICS) + set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) endif (NOT MSVC) if (protobuf_BUILD_SHARED_LIBS)