summaryrefslogtreecommitdiff
path: root/src/cmake
diff options
context:
space:
mode:
authorKitzunu <24550914+Kitzunu@users.noreply.github.com>2022-02-11 14:37:24 +0100
committerGitHub <noreply@github.com>2022-02-11 14:37:24 +0100
commit7e8b021db36bd54fe7bd10eefa2902416e75c97e (patch)
treee3a3c7221174c9dd5063ebc3010fee4d5e716a87 /src/cmake
parent8a9a3c6fac57577d8849ec5aea81c5583fbf6092 (diff)
feat(Core): Enable C++20 support (#10440)
* feat(Core): Enable C++20 support * Update Duration.h * Revert "Update Duration.h" This reverts commit 177093e992c5d47d8c3b978c84857f5ecba12889. * maybe fix GCC * cherry-pick https://gcc.gnu.org/pipermail/gcc-cvs/2020-June/299715.html * Update Duration.h * Update Duration.h * Update Duration.h * Update Duration.h * Update Duration.h * Update Duration.h * Update Duration.h * Revert "Update Duration.h" This reverts commit dc4e2ce281dd1a33cfac5be56488a3b96131bfd5. * Update Duration.h * Update Duration.h * Update Duration.h * cleanup * more cleanup * maybe fix build * restore advstd::type_identity because GCC8 is garbage * Update advstd.h * fix gcc8 :zzz: * Update CMakeLists.txt * Update CMakeLists.txt * Update src/common/Utilities/advstd.h Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com>
Diffstat (limited to 'src/cmake')
-rw-r--r--src/cmake/macros/ConfigureBaseTargets.cmake12
-rw-r--r--src/cmake/showoptions.cmake6
2 files changed, 3 insertions, 15 deletions
diff --git a/src/cmake/macros/ConfigureBaseTargets.cmake b/src/cmake/macros/ConfigureBaseTargets.cmake
index 046b8728f1..830a634ba6 100644
--- a/src/cmake/macros/ConfigureBaseTargets.cmake
+++ b/src/cmake/macros/ConfigureBaseTargets.cmake
@@ -16,15 +16,9 @@ add_library(acore-compile-option-interface INTERFACE)
# Use -std=c++11 instead of -std=gnu++11
set(CXX_EXTENSIONS OFF)
-if (USE_CPP_20)
- # Enable support С++20
- set(CMAKE_CXX_STANDARD 20)
- message(STATUS "Enabled С++20 standard")
-else()
- # Enable support С++17
- set(CMAKE_CXX_STANDARD 17)
- message(STATUS "Enabled С++17 standard")
-endif()
+# Enable C++20 support
+set(CMAKE_CXX_STANDARD 20)
+message(STATUS "Enabled С++20 standard")
# An interface library to make the warnings level available to other targets
# This interface taget is set-up through the platform specific script
diff --git a/src/cmake/showoptions.cmake b/src/cmake/showoptions.cmake
index 906692e106..1d2366a281 100644
--- a/src/cmake/showoptions.cmake
+++ b/src/cmake/showoptions.cmake
@@ -182,12 +182,6 @@ if(BUILD_SHARED_LIBS)
WarnAboutSpacesInBuildPath()
endif()
-if (USE_CPP_20)
- message("")
- message(" *** Enabled C++20 standart")
- message(" *** Please note that this is an experimental feature!")
-endif()
-
if (CONFIG_ABORT_INCORRECT_OPTIONS)
message("")
message(" WARNING !")