diff options
| author | Derek Mauro <dmauro@google.com> | 2024-01-10 08:32:46 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2024-01-10 08:33:52 -0800 |
| commit | bcce85ef8d9042794a50e4afbbd2c672121ab0d2 (patch) | |
| tree | d9313345d2884610a965474092ecdd96d9932197 /CMake/AbseilDll.cmake | |
| parent | bddf28e9230364e45637a4a8725387d57fdfb79c (diff) | |
| download | abseil-bcce85ef8d9042794a50e4afbbd2c672121ab0d2.tar.gz abseil-bcce85ef8d9042794a50e4afbbd2c672121ab0d2.tar.bz2 abseil-bcce85ef8d9042794a50e4afbbd2c672121ab0d2.zip | |
Fix CMake compiled ABI options after f845e60acd880dbf07788a5a2c0dbad0f9c57231.
f845e60acd880dbf07788a5a2c0dbad0f9c57231 added an option to use C++20's
<ordering> header but the CMake install configured this as an alias
in C++17 when it is not available.
Fixes #1597
PiperOrigin-RevId: 597258569
Change-Id: I40277d55702601e1686370bee6af9b7491fd2000
Diffstat (limited to 'CMake/AbseilDll.cmake')
| -rw-r--r-- | CMake/AbseilDll.cmake | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/CMake/AbseilDll.cmake b/CMake/AbseilDll.cmake index bf273ceb..47f3beeb 100644 --- a/CMake/AbseilDll.cmake +++ b/CMake/AbseilDll.cmake @@ -627,17 +627,32 @@ include(CheckCXXSourceCompiles) check_cxx_source_compiles( [==[ #ifdef _MSC_VER -# if _MSVC_LANG < 201700L +# if _MSVC_LANG < 201703L # error "The compiler defaults or is configured for C++ < 17" # endif -#elif __cplusplus < 201700L +#elif __cplusplus < 201703L # error "The compiler defaults or is configured for C++ < 17" #endif int main() { return 0; } ]==] ABSL_INTERNAL_AT_LEAST_CXX17) -if(ABSL_INTERNAL_AT_LEAST_CXX17) +check_cxx_source_compiles( + [==[ +#ifdef _MSC_VER +# if _MSVC_LANG < 202002L +# error "The compiler defaults or is configured for C++ < 20" +# endif +#elif __cplusplus < 202002L +# error "The compiler defaults or is configured for C++ < 20" +#endif +int main() { return 0; } +]==] + ABSL_INTERNAL_AT_LEAST_CXX20) + +if(ABSL_INTERNAL_AT_LEAST_CXX20) + set(ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_20) +elseif(ABSL_INTERNAL_AT_LEAST_CXX17) set(ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_17) else() set(ABSL_INTERNAL_CXX_STD_FEATURE cxx_std_14) @@ -807,8 +822,8 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n") if(ABSL_PROPAGATE_CXX_STD) # Abseil libraries require C++14 as the current minimum standard. When - # compiled with C++17 (either because it is the compiler's default or - # explicitly requested), then Abseil requires C++17. + # compiled with a higher minimum (either because it is the compiler's + # default or explicitly requested), then Abseil requires that standard. target_compile_features(${_dll} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE}) endif() |