diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2013-01-07 20:52:45 (GMT) |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2013-01-07 20:52:45 (GMT) |
| commit | 3d2e6a06874603ebe6152045c34de9147a0c11dc (patch) | |
| tree | eff99c5763c6536f58ae34a446150cd9de02ebdd | |
| parent | 7a1b961de8b79416d168355e71f5af80fa4dbd02 (diff) | |
| download | CMake-3d2e6a06874603ebe6152045c34de9147a0c11dc.zip CMake-3d2e6a06874603ebe6152045c34de9147a0c11dc.tar.gz CMake-3d2e6a06874603ebe6152045c34de9147a0c11dc.tar.bz2 | |
check for Haiku only with __HAIKU__
| -rw-r--r-- | Modules/CMakeFortranCompilerId.F.in | 6 | ||||
| -rw-r--r-- | Modules/CMakePlatformId.h.in | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in index 4d25de0..f84852a 100644 --- a/Modules/CMakeFortranCompilerId.F.in +++ b/Modules/CMakeFortranCompilerId.F.in @@ -74,12 +74,8 @@ PRINT *, 'INFO:platform[IRIX]' #elif defined(__hpux) || defined(__hpux__) PRINT *, 'INFO:platform[HP-UX]' -#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) +#elif defined(__HAIKU__) PRINT *, 'INFO:platform[Haiku]' -# if 0 -! Haiku also defines __BEOS__ so we must -! put it prior to the check for __BEOS__ -# endif #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) PRINT *, 'INFO:platform[BeOS]' #elif defined(__QNX__) || defined(__QNXNTO__) 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" |