diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-10 15:22:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-01-10 15:22:14 (GMT) |
| commit | 42d9df9f4f5b06de0f75859cc40750c9b8eec9a1 (patch) | |
| tree | b2b3ece2e4e0341c4cd2ba7de4e07b58dc881e54 /Source | |
| parent | 8a7a4c043c2fede043ce8bf8676a95e1b779fe5e (diff) | |
| parent | 0380f36cd8dbdf7a89f8fac91d99235e75075bde (diff) | |
| download | CMake-42d9df9f4f5b06de0f75859cc40750c9b8eec9a1.zip CMake-42d9df9f4f5b06de0f75859cc40750c9b8eec9a1.tar.gz CMake-42d9df9f4f5b06de0f75859cc40750c9b8eec9a1.tar.bz2 | |
Merge topic 'Haiku'
0380f36 FindOpenGL: add Haiku paths
8e9630c FindGLUT: BeOS does not have libXi and libXmu
50bfedf FindLua51: do not try to link libm on BeOS
3d2e6a0 check for Haiku only with __HAIKU__
7a1b961 Haiku no longer defines __BEOS__
ed96d9a bootstrap: use better defaults for Haiku
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackGeneratorFactory.cxx | 4 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx index 55776739..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 |