diff options
| author | Abseil Team <absl-team@google.com> | 2017-11-06T20·54-0800 |
|---|---|---|
| committer | misterg <misterg@google.com> | 2017-11-06T20·58-0500 |
| commit | 075cf62092b39b640798f70bf7d16b6c82ca2842 (patch) | |
| tree | 2a342484ba68d37bc6b296cf426477980373a4c8 /CMakeLists.txt | |
| parent | 78e1abca86f4294ab26ef36e534798b893c828bd (diff) | |
Changes imported from Abseil "staging" branch:
- c3a608de577e0c278b50916ad4803549929f8f72 Merging https://github.com/abseil/abseil-cpp/pull/8/ inte... by Gennadiy Civil <misterg@google.com> - d0b528cdf5843db871784c629cb4e7c5165af716 explicitly cast -1 for Span::npos by Jon Cohen <cohenjon@google.com> - 32066311a4379f1144f029aaa3740af59b1e364e Remove GUARDED_VAR and PT_GUARDED_VAR entirely. by Abseil Team <absl-team@google.com> - 3d3c69d97d15b5c6457906631054109094c083a6 Remove unneeded inline on constexpr definitions. by Alex Strelnikov <strel@google.com> - a9a8fe71f90d0b80de8e77375228a7185032636b Remove unneeded lint suppression. by Alex Strelnikov <strel@google.com> GitOrigin-RevId: c3a608de577e0c278b50916ad4803549929f8f72 Change-Id: I0897ce0b11e41f83fed8d88f18e079a15d086527
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ddd60502d4..e87f4a84ab 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 |