diff options
| author | Tom de Geus | 2021-01-20 21:12:18 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2021-05-09 18:05:37 +0200 |
| commit | b325c6d81e2abf945529a3baf0619b5a696e464f (patch) | |
| tree | 8a3ac8da214830d6db0f1bd540987b9b2bdcffb9 | |
| parent | d4a3cd99925166d6cbaed8f26fd989083ddae0a8 (diff) | |
| download | catch3-b325c6d81e2abf945529a3baf0619b5a696e464f.tar.gz | |
Making target detection on Mac more robust
| -rw-r--r-- | src/catch2/internal/catch_platform.hpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/catch2/internal/catch_platform.hpp b/src/catch2/internal/catch_platform.hpp index 537abce5..8ecf01ad 100644 --- a/src/catch2/internal/catch_platform.hpp +++ b/src/catch2/internal/catch_platform.hpp @@ -8,13 +8,16 @@ #ifndef CATCH_PLATFORM_HPP_INCLUDED #define CATCH_PLATFORM_HPP_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 |