[Cmake-commits] [cmake-commits] hoffman committed CMakeFortranCompilerId.F90.in 1.2 1.3 CMakePlatformId.h.in 1.2 1.3 CheckForPthreads.c 1.3 1.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv30779/Modules

Modified Files:
	CMakeFortranCompilerId.F90.in CMakePlatformId.h.in 
	CheckForPthreads.c 
Log Message:
ENH: add initial support for HAIKU OS from bug# 7425


Index: CheckForPthreads.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckForPthreads.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CheckForPthreads.c	4 Dec 2006 22:26:08 -0000	1.3
--- CheckForPthreads.c	15 Sep 2008 21:53:27 -0000	1.4
***************
*** 17,21 ****
    pthread_create(&tid[1], 0, runner, (void*)2);
    
! #if defined(__BEOS__) && !defined(__ZETA__)  // (no usleep on BeOS 5.)
    usleep(1); // for strange behavior on single-processor sun
  #endif
--- 17,21 ----
    pthread_create(&tid[1], 0, runner, (void*)2);
    
! #if defined(__BEOS__) && !defined(__ZETA__)  && !defined(__HAIKU__) // (no usleep on BeOS 5.)
    usleep(1); // for strange behavior on single-processor sun
  #endif

Index: CMakePlatformId.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakePlatformId.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CMakePlatformId.h.in	10 Mar 2008 13:32:25 -0000	1.2
--- CMakePlatformId.h.in	15 Sep 2008 21:53:27 -0000	1.3
***************
*** 36,39 ****
--- 36,45 ----
  # define PLATFORM_ID "HP-UX"
  
+ #elif defined(__HAIKU) || defined(__HAIKU__) || 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"

Index: CMakeFortranCompilerId.F90.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranCompilerId.F90.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CMakeFortranCompilerId.F90.in	16 May 2008 21:50:23 -0000	1.2
--- CMakeFortranCompilerId.F90.in	15 Sep 2008 21:53:27 -0000	1.3
***************
*** 51,54 ****
--- 51,58 ----
  #elif defined(__hpux) || defined(__hpux__)
     PRINT *, 'INFO:platform[HP-UX]'
+ #elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU)
+    PRINT *, 'INFO:platform[Haiku]'
+ ! Haiku also defines __BEOS__ so we must 
+ ! put it prior to the check for __BEOS__
  #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS)
     PRINT *, 'INFO:platform[BeOS]'