You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.5 KiB
40 lines
1.5 KiB
From 66e847d4e14be3a369b7e26a03a172b20e62c003 Mon Sep 17 00:00:00 2001
|
|
From: eksi <eksi@eksi.eksi>
|
|
Date: Wed, 4 Nov 2020 20:37:01 +0300
|
|
Subject: [PATCH] Add an option to disable -Werror. Fixes #1528
|
|
|
|
---
|
|
cmake/ranges_flags.cmake | 4 +++-
|
|
cmake/ranges_options.cmake | 3 +++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/cmake/ranges_flags.cmake b/cmake/ranges_flags.cmake
|
|
index 76d893043..9b09ddcb8 100644
|
|
--- a/cmake/ranges_flags.cmake
|
|
+++ b/cmake/ranges_flags.cmake
|
|
@@ -88,7 +88,9 @@ else()
|
|
# Enable "normal" warnings and make them errors:
|
|
ranges_append_flag(RANGES_HAS_WALL -Wall)
|
|
ranges_append_flag(RANGES_HAS_WEXTRA -Wextra)
|
|
- ranges_append_flag(RANGES_HAS_WERROR -Werror)
|
|
+ if (RANGES_ENABLE_WERROR)
|
|
+ ranges_append_flag(RANGES_HAS_WERROR -Werror)
|
|
+ endif()
|
|
endif()
|
|
|
|
if (RANGES_ENV_LINUX AND RANGES_CXX_COMPILER_CLANG)
|
|
diff --git a/cmake/ranges_options.cmake b/cmake/ranges_options.cmake
|
|
index 4ec39c7f0..8455af306 100644
|
|
--- a/cmake/ranges_options.cmake
|
|
+++ b/cmake/ranges_options.cmake
|
|
@@ -16,6 +16,9 @@ option(RANGES_MODULES "Enables use of Clang modules (experimental)." OFF)
|
|
option(RANGES_NATIVE "Enables -march/-mtune=native." ON)
|
|
option(RANGES_VERBOSE_BUILD "Enables debug output from CMake." OFF)
|
|
option(RANGES_LLVM_POLLY "Enables LLVM Polly." OFF)
|
|
+option(RANGES_ENABLE_WERROR
|
|
+ "Enables -Werror. Only effective if compiler is not clang-cl or MSVC. ON by default"
|
|
+ ON)
|
|
option(RANGES_PREFER_REAL_CONCEPTS
|
|
"Use real concepts instead of emulation if the compiler supports it"
|
|
ON)
|