[cmake-commits] hoffman committed cmCTest.cxx 1.312 1.313 cmDependsJavaLexer.cxx 1.10 1.11 cmDependsJavaLexer.h 1.3 1.4 cmMakefile.cxx 1.368 1.369 cmSystemTools.cxx 1.330 1.331

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTest.cxx cmDependsJavaLexer.cxx cmDependsJavaLexer.h 
	cmMakefile.cxx cmSystemTools.cxx 
Log Message:
ENH: merge in changes for beos support


Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- cmCTest.cxx	19 Oct 2006 19:00:06 -0000	1.312
+++ cmCTest.cxx	4 Dec 2006 22:26:38 -0000	1.313
@@ -48,6 +48,10 @@
 
 #include <memory> // auto_ptr
 
+#if defined(__BEOS__)
+#include <be/kernel/OS.h>   /* disable_debugger() API. */
+#endif
+
 #define DEBUGOUT std::cout << __LINE__ << " "; std::cout
 #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr
 
@@ -589,6 +593,8 @@
   cmSystemTools::PutEnv("DASHBOARD_TEST_FROM_CTEST=" CMake_VERSION);
 #if defined(_WIN32)
   SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
+#elif defined(__BEOS__)
+  disable_debugger(1);
 #endif
 }
 

Index: cmDependsJavaLexer.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDependsJavaLexer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmDependsJavaLexer.h	10 Mar 2006 18:54:57 -0000	1.3
+++ cmDependsJavaLexer.h	4 Dec 2006 22:26:39 -0000	1.4
@@ -22,6 +22,10 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#if defined(__BEOS__)
+#include <unistd.h>   /* prevents a conflict with a #define later on... */
+#endif
+
 /* end standard C headers. */
 
 /* flex integer type definitions */

Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- cmSystemTools.cxx	19 Oct 2006 19:00:08 -0000	1.330
+++ cmSystemTools.cxx	4 Dec 2006 22:26:40 -0000	1.331
@@ -1432,7 +1432,12 @@
     return -1;
     }
 
-#if !defined(_WIN32) || defined(__CYGWIN__)
+#if defined(__BEOS__) && !defined(__ZETA__) // no fchmod on BeOS 5...do pathname instead.
+  if ((oflags & O_CREAT) && chmod(pathname, mode))
+    {
+    return -1;
+    }
+#elif !defined(_WIN32) || defined(__CYGWIN__)
   if ((oflags & O_CREAT) && fchmod(fd, mode))
     {
     return -1;

Index: cmDependsJavaLexer.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDependsJavaLexer.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cmDependsJavaLexer.cxx	23 Aug 2006 16:02:30 -0000	1.10
+++ cmDependsJavaLexer.cxx	4 Dec 2006 22:26:39 -0000	1.11
@@ -23,6 +23,10 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#if defined(__BEOS__)
+#include <unistd.h>   /* prevents a conflict with a #define later on... */
+#endif
+
 /* end standard C headers. */
 
 /* flex integer type definitions */

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -d -r1.368 -r1.369
--- cmMakefile.cxx	29 Nov 2006 22:10:29 -0000	1.368
+++ cmMakefile.cxx	4 Dec 2006 22:26:39 -0000	1.369
@@ -1946,6 +1946,9 @@
 #if defined(__QNXNTO__)
   this->AddDefinition("QNXNTO", "1");
 #endif
+#if defined(__BEOS__)
+  this->AddDefinition("BEOS", "1");
+#endif
 
   char temp[1024];
   sprintf(temp, "%d", cmVersion::GetMinorVersion());