From d454926e0fccd71706586cf8d58e83e7cc4f92b5 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 28 Mar 2021 21:32:28 +0200 Subject: [PATCH] cmake: Hotfix the broken build This regressed in #6000 and started complaining about bad literal suffixes, so here's a quick and dirty partial revert to make things build again. --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 985ce1c050e..847e26df418 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,6 +71,12 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + add_compile_options(-fconcepts -Wno-literal-suffix) +elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + add_compile_options(-Wno-overloaded-virtual -Wno-user-defined-literals) +endif() + if (ENABLE_ALL_THE_DEBUG_MACROS) include(${CMAKE_SOURCE_DIR}/Meta/CMake/all_the_debug_macros.cmake) endif(ENABLE_ALL_THE_DEBUG_MACROS)