Merge pull request #2157 from tdegeus/patch

Making target detection on Mac more robust
2025-01-15 22:58:02 +00:00 · 2021-01-21 15:35:23 +01:00 · 2021-01-20 21:12:18 +01:00
1 changed files with 9 additions and 6 deletions
--- a/include/internal/catch_platform.h
+++ b/include/internal/catch_platform.h
@ -9,13 +9,16 @@
 #ifndef TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
 #define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED

+// See e.g.:
+// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html
 #ifdef __APPLE__
-# include <TargetConditionals.h>
-# if TARGET_OS_OSX == 1
-#  define CATCH_PLATFORM_MAC
-# elif TARGET_OS_IPHONE == 1
-#  define CATCH_PLATFORM_IPHONE
-# endif
+#  include <TargetConditionals.h>
+#  if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \
+      (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1)
+#    define CATCH_PLATFORM_MAC
+#  elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1)
+#    define CATCH_PLATFORM_IPHONE
+#  endif

 #elif defined(linux) || defined(__linux) || defined(__linux__)
 #  define CATCH_PLATFORM_LINUX
Author	SHA1	Message	Date
Martin Hořeňovský	bcb9ea8cb5	Merge pull request #2157 from tdegeus/patch Making target detection on Mac more robust	2021-01-21 15:35:23 +01:00
Tom de Geus	d4c9494eb5	Making target detection on Mac more robust	2021-01-20 21:12:18 +01:00