This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d98f561003af82e31ccae2fa324441c18b5b5c33 (commit)
via 3d2e6a06874603ebe6152045c34de9147a0c11dc (commit)
via 7a1b961de8b79416d168355e71f5af80fa4dbd02 (commit)
via ed96d9a605471694465dd7142dd25748dfdf3a90 (commit)
from d491ccc926f3fdaf2cef1329cc9bfc77a87568ad (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d98f561003af82e31ccae2fa324441c18b5b5c33
commit d98f561003af82e31ccae2fa324441c18b5b5c33
Merge: d491ccc 3d2e6a0
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Mon Jan 7 15:54:53 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 7 15:54:53 2013 -0500
Merge topic 'Haiku' into next
3d2e6a0 check for Haiku only with __HAIKU__
7a1b961 Haiku no longer defines __BEOS__
ed96d9a bootstrap: use better defaults for Haiku
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d2e6a06874603ebe6152045c34de9147a0c11dc
commit 3d2e6a06874603ebe6152045c34de9147a0c11dc
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Mon Jan 7 21:52:45 2013 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Mon Jan 7 21:52:45 2013 +0100
check for Haiku only with __HAIKU__
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"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a1b961de8b79416d168355e71f5af80fa4dbd02
commit 7a1b961de8b79416d168355e71f5af80fa4dbd02
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Mon Jan 7 21:20:11 2013 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Mon Jan 7 21:20:11 2013 +0100
Haiku no longer defines __BEOS__
diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c
index 882dc21..7250fbf 100644
--- a/Modules/CheckForPthreads.c
+++ b/Modules/CheckForPthreads.c
@@ -16,7 +16,7 @@ int main(int ac, char*av[]){
pthread_create(&tid[0], 0, runner, (void*)1);
pthread_create(&tid[1], 0, runner, (void*)2);
-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no
usleep on BeOS 5.)
+#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.)
usleep(1); // for strange behavior on single-processor sun
#endif
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx
b/Source/CPack/cmCPackGeneratorFactory.cxx
index 5577673..b36c2a2 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -33,7 +33,7 @@
#endif
#if !defined(_WIN32) \
- && !defined(__QNXNTO__) && !defined(__BEOS__)
+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
# include "cmCPackDebGenerator.h"
# include "cmCPackRPMGenerator.h"
#endif
@@ -126,7 +126,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory()
}
#endif
#if !defined(_WIN32) \
- && !defined(__QNXNTO__) && !defined(__BEOS__)
+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__)
if (cmCPackDebGenerator::CanGenerate())
{
this->RegisterGenerator("DEB", "Debian packages",
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index bb6f3f2..322a6a2 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -53,7 +53,7 @@
#include <cm_zlib.h>
#include <cmsys/Base64.h>
-#if defined(__BEOS__) && !defined(__HAIKU__)
+#if defined(__BEOS__)
#include <be/kernel/OS.h> /* disable_debugger() API. */
#endif
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed96d9a605471694465dd7142dd25748dfdf3a90
commit ed96d9a605471694465dd7142dd25748dfdf3a90
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Mon Jan 7 21:09:18 2013 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Mon Jan 7 21:09:18 2013 +0100
bootstrap: use better defaults for Haiku
These values are patched into that file by Haiku since 2.8.1.
diff --git a/bootstrap b/bootstrap
index 643720c..9a4f796 100755
--- a/bootstrap
+++ b/bootstrap
@@ -159,7 +159,9 @@ if ${cmake_system_mingw}; then
cmake_default_prefix="c:/Program Files/CMake"
fi
elif ${cmake_system_haiku}; then
- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY`
+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY`
+ cmake_man_dir="/documentation/man"
+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}"
else
cmake_default_prefix="/usr/local"
fi
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeFortranCompilerId.F.in | 6 +-----
Modules/CMakePlatformId.h.in | 5 +----
Modules/CheckForPthreads.c | 2 +-
Source/CPack/cmCPackGeneratorFactory.cxx | 4 ++--
Source/cmCTest.cxx | 2 +-
bootstrap | 4 +++-
6 files changed, 9 insertions(+), 14 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
