From 075cf62092b39b640798f70bf7d16b6c82ca2842 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 6 Nov 2017 12:54:54 -0800 Subject: Changes imported from Abseil "staging" branch: - c3a608de577e0c278b50916ad4803549929f8f72 Merging https://github.com/abseil/abseil-cpp/pull/8/ inte... by Gennadiy Civil - d0b528cdf5843db871784c629cb4e7c5165af716 explicitly cast -1 for Span::npos by Jon Cohen - 32066311a4379f1144f029aaa3740af59b1e364e Remove GUARDED_VAR and PT_GUARDED_VAR entirely. by Abseil Team - 3d3c69d97d15b5c6457906631054109094c083a6 Remove unneeded inline on constexpr definitions. by Alex Strelnikov - a9a8fe71f90d0b80de8e77375228a7185032636b Remove unneeded lint suppression. by Alex Strelnikov GitOrigin-RevId: c3a608de577e0c278b50916ad4803549929f8f72 Change-Id: I0897ce0b11e41f83fed8d88f18e079a15d086527 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index ddd6050..e87f4a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ check_target(gmock) set(ABSL_EXCEPTIONS_FLAG "${CMAKE_CXX_EXCEPTIONS}") # fix stuff -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FIX_MSVC} ${CMAKE_CXX_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FIX_MSVC} ${CMAKE_CXX_FLAGS}") list(APPEND ABSL_TEST_COMMON_LIBRARIES gtest_main -- cgit v1.2.3