From 279c0ad89b83297b473221bbb6d97782f4387be5 Mon Sep 17 00:00:00 2001
From: Dmitry Kobets <dmitrykobets@microsoft.com>
Date: Tue, 30 Nov 2021 13:13:35 -0800
Subject: [PATCH] Check for presence of variable

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

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ed6cb01..837b6ee 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -130,10 +130,10 @@ else()
             -Wno-unused-member-function
             -Wno-unused-variable
           >
-          $<$<EQUAL:${CMAKE_CXX_STANDARD},20>:-Wzero-as-null-pointer-constant-> # Very noisy, minor, and just so
-                                                                                # happens to trigger on googletest
-                                                                                # for Ubuntu 20.04
-          $<$<EQUAL:${CMAKE_CXX_STANDARD},20>:-Wsign-conversion->
+          $<$<AND:$<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>>: