From d4ba9cce8a1d8ff9ae4eb4ccf47b9dbbef44cc42 Mon Sep 17 00:00:00 2001
From: Tasos Sahanidis <tasos@tasossah.com>
Date: Fri, 27 May 2022 21:14:24 +0300
Subject: [PATCH] Enable Wzero-as-null-pointer-constant by default

---
 cmake/modules/CkbNextCompileFlags.cmake | 5 +++++
 src/gui/CMakeLists.txt                  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/CkbNextCompileFlags.cmake b/cmake/modules/CkbNextCompileFlags.cmake
index 8f246561..d054cdd4 100644
--- a/cmake/modules/CkbNextCompileFlags.cmake
+++ b/cmake/modules/CkbNextCompileFlags.cmake
@@ -75,5 +75,10 @@ list(APPEND CKB_NEXT_EXTRA_C_FLAGS
         -Werror=incompatible-pointer-types
     )
 
+set(CKB_NEXT_EXTRA_CXX_FLAGS "")
+list(APPEND CKB_NEXT_EXTRA_CXX_FLAGS
+        -Wzero-as-null-pointer-constant
+    )
+
 string(REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 string(REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 8a9097ec..4ed7a8b0 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -560,7 +560,8 @@ set_target_properties(
 target_compile_options(
     ckb-next
         PRIVATE
-          "${CKB_NEXT_COMMON_COMPILE_FLAGS}")
+          "${CKB_NEXT_COMMON_COMPILE_FLAGS}"
+          "${CKB_NEXT_EXTRA_CXX_FLAGS}")
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     target_compile_options(