From 502fa7625ff5af660fcf4c4e789f5c70b59d3fb4 Mon Sep 17 00:00:00 2001
From: Dmitry Kobets <dmitrykobets@microsoft.com>
Date: Tue, 30 Nov 2021 13:22:13 -0800
Subject: [PATCH] Try short-circuit form

---
 tests/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 837b6ee..48675d9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -130,11 +130,13 @@ else()
             -Wno-unused-member-function
             -Wno-unused-variable
           >
-          $<$<AND:$<BOOL:${CMAKE_CXX_STANDARD}>,$<EQUAL:${CMAKE_CXX_STANDARD},20>>:
+          $<$<BOOL:${CMAKE_CXX_STANDARD}>:
+            $<$<EQUAL:${CMAKE_CXX_STANDARD},20>:
             -Wzero-as-null-pointer-constant- # Very noisy, minor, and just so
             -Wsign-conversion-                                                                   # happens to trigger on googletest
           >
         >
+        >
         $<$<CXX_COMPILER_ID:Clang>:
           $<$<AND:$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,4.99>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,6>>:
             $<$<EQUAL:${GSL_CXX_STANDARD},17>:-Wno-undefined-func-template>