diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-31 14:58:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-01-31 14:58:50 (GMT) |
| commit | 118c32f8f211b0bb9a096fbb0711cacf2b68f057 (patch) | |
| tree | d72f1f0bc3aeea7ab9c95f130f7de435fc2cf262 /Modules/CMakePlatformId.h.in | |
| parent | cf8645e82dbb7dff434b14bd127c5457745e4db8 (diff) | |
| parent | f447db7f102519e09258f0bd06668a9ae572ec68 (diff) | |
| download | CMake-118c32f8f211b0bb9a096fbb0711cacf2b68f057.zip CMake-118c32f8f211b0bb9a096fbb0711cacf2b68f057.tar.gz CMake-118c32f8f211b0bb9a096fbb0711cacf2b68f057.tar.bz2 | |
Merge branch 'xcode-duplicate-flags-13354' into generator-toolset
Diffstat (limited to 'Modules/CMakePlatformId.h.in')
| -rw-r--r-- | Modules/CMakePlatformId.h.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in index c373414..69171c2 100644 --- a/Modules/CMakePlatformId.h.in +++ b/Modules/CMakePlatformId.h.in @@ -35,11 +35,8 @@ #elif defined(__hpux) || defined(__hpux__) # define PLATFORM_ID "HP-UX" -#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) +#elif defined(__HAIKU__) # define PLATFORM_ID "Haiku" -/* Haiku also defines __BEOS__ so we must - put it prior to the check for __BEOS__ -*/ #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) # define PLATFORM_ID "BeOS" |