[cmake-commits] hoffman committed CMakeDetermineCXXCompiler.cmake 1.31 1.32 CheckForPthreads.c 1.2 1.3

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Dec 4 17:26:12 EST 2006


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

Modified Files:
	CMakeDetermineCXXCompiler.cmake CheckForPthreads.c 
Log Message:
ENH: merge in changes for beos support


Index: CheckForPthreads.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckForPthreads.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CheckForPthreads.c	15 Apr 2004 12:22:19 -0000	1.2
+++ CheckForPthreads.c	4 Dec 2006 22:26:08 -0000	1.3
@@ -16,7 +16,10 @@
   pthread_create(&tid[0], 0, runner, (void*)1);
   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
+
   pthread_join(tid[0], 0);
   pthread_join(tid[1], 0);
   if(ac > 1000){return *av[0];}

Index: CMakeDetermineCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCXXCompiler.cmake,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- CMakeDetermineCXXCompiler.cmake	29 Aug 2006 17:59:15 -0000	1.31
+++ CMakeDetermineCXXCompiler.cmake	4 Dec 2006 22:26:08 -0000	1.32
@@ -59,6 +59,14 @@
   SET(CMAKE_COMPILER_IS_GNUCXX_RUN 1)
 ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
 
+# The g++ that comes with BeOS 5 segfaults if you run "g++ -E"
+#  ("gcc -E" is fine), which throws up a system dialog box that hangs cmake
+#  until the user clicks "OK"...so for now, we just assume it's g++.
+IF(BEOS)
+  SET(CMAKE_COMPILER_IS_GNUCXX 1)
+  SET(CMAKE_COMPILER_IS_GNUCXX_RUN 1)
+ENDIF(BEOS)
+
 IF(NOT CMAKE_COMPILER_IS_GNUCXX_RUN)
   # test to see if the cxx compiler is gnu
   SET(CMAKE_COMPILER_IS_GNUCXX_RUN 1)



More information about the Cmake-commits mailing list