From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 27 Aug 2021 09:07:58 +0000 (+0200)
Subject: Disable dangerous macOS SDK macros
X-Git-Tag: v1.11.90~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e7f8370ffc7371fc1fb175896c7952d99be95312;p=tigervnc.git

Disable dangerous macOS SDK macros

They define macros such as "check()" which causes our code to break as
we have methods with that name.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62b87a2e..6d765f75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,11 @@ if(WIN32)
   add_definitions(-D_WIN32_WINNT=0x0601)
 endif()
 
+# Legacy macros (macOS 10.12 and older) conflict with our code
+if(APPLE)
+  add_definitions(-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0)
+endif()
+
 if(CMAKE_SIZEOF_VOID_P MATCHES 8)
   message(STATUS "64-bit build")
 else()