Browse Source
Merge pull request #5592 from arkamar/unify-cxx-standard
[Fix] Use C++20 standard consistently to resolve ODR violations
pull/5593/head
Vsevolod Stakhov
2 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
2 additions and
2 deletions
-
contrib/backward-cpp/CMakeLists.txt
-
contrib/simdutf/cmake/simdutf-flags.cmake
|
|
|
@ -46,7 +46,7 @@ endif() |
|
|
|
|
|
|
|
# set CXX standard |
|
|
|
set(CMAKE_CXX_STANDARD_REQUIRED True) |
|
|
|
set(CMAKE_CXX_STANDARD 11) |
|
|
|
set(CMAKE_CXX_STANDARD 20) |
|
|
|
if (${COMPILER_IS_NVCC}) |
|
|
|
# GNU CXX extensions are not supported by nvcc |
|
|
|
set(CMAKE_CXX_EXTENSIONS OFF) |
|
|
|
|
|
|
|
@ -18,7 +18,7 @@ endif() |
|
|
|
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake") |
|
|
|
|
|
|
|
# We compile tools, tests, etc. with C++ 11. Override yourself if you need on a target. |
|
|
|
set(SIMDUTF_CXX_STANDARD 11 CACHE STRING "the C++ standard to use for simdutf") |
|
|
|
set(SIMDUTF_CXX_STANDARD 20 CACHE STRING "the C++ standard to use for simdutf") |
|
|
|
|
|
|
|
set(CMAKE_CXX_STANDARD ${SIMDUTF_CXX_STANDARD}) |
|
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON) |
|
|
|
|
