diff options
| author |  Benjamin Barenblat <bbaren@google.com> | 2020-09-25 17:10:06 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2020-09-25 17:10:06 -0400 |
| commit | 4e1c98fe594d99494ce26e94a77f0358705f227c (patch) | |
| tree | a07e9daefa3b5acf716ce89fa1a1c9b500fde795 /absl/copts/AbseilConfigureCopts.cmake | |
| parent | 7a1e14d0d29736ba9c2884d0ce81fc0af92f6ab3 (diff) | |
| parent | b56cbdd23834a65682c0b46f367f8679e83bc894 (diff) | |
Merge new upstream LTS 20200923
Diffstat (limited to 'absl/copts/AbseilConfigureCopts.cmake')
| -rw-r--r-- | absl/copts/AbseilConfigureCopts.cmake | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/absl/copts/AbseilConfigureCopts.cmake b/absl/copts/AbseilConfigureCopts.cmake index 77d4ace8..acd46d04 100644 --- a/absl/copts/AbseilConfigureCopts.cmake +++ b/absl/copts/AbseilConfigureCopts.cmake @@ -12,7 +12,7 @@ else() set(ABSL_BUILD_DLL FALSE) endif() -if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64") +if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64|amd64|AMD64") if (MSVC) set(ABSL_RANDOM_RANDEN_COPTS "${ABSL_RANDOM_HWAES_MSVC_X64_FLAGS}") else() @@ -64,11 +64,4 @@ else() set(ABSL_TEST_COPTS "") endif() -if("${CMAKE_CXX_STANDARD}" EQUAL 98) - message(FATAL_ERROR "Abseil requires at least C++11") -elseif(NOT "${CMAKE_CXX_STANDARD}") - message(STATUS "No CMAKE_CXX_STANDARD set, assuming 11") - set(ABSL_CXX_STANDARD 11) -else() - set(ABSL_CXX_STANDARD "${CMAKE_CXX_STANDARD}") -endif() +set(ABSL_CXX_STANDARD "${CMAKE_CXX_STANDARD}") |