Re: [CMake] Setting compiler for cmake
outro pessoa outro.pes...@gmail.com
writes:
Did it require any extra options outside of: clang bin/, clang lib/ , and
the implicit link list when you started using clang-is-compiler?
It can be as easy as:
CC=clang CXX=clang cmake ...
or alternatively
cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ...
Use a full path to clang/clang++ if they are installed on custom
directories outside of PATH.
If you wish tho use libc++ or other goodies I suppose(*) that you can
add the options in your CMakeLists.txt:
if( ${CMAKE_CXX_COMPILER_ID} MATCHES Clang )
...
endif()
[*] I don't use those libraries, so never checked that the above works.
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake
[CMake] curses parameter problem while crosscompiling
Hi I´m trying to cross compile a programm and its works fine if I disable curses but when I enable it I cant find the right configuration for the curses files or dirs. Maybe someone could point me to a Website (or just tell me :)) where I can find the informations which files or dirs I have to enter for the following parameters: //Path to a file. CURSES_CURSES_H_PATH:PATH= //Path to a library. CURSES_CURSES_LIBRARY:FILEPATH= //Path to a library. CURSES_EXTRA_LIBRARY:FILEPATH= //Path to a library. CURSES_FORM_LIBRARY:FILEPATH= //Path to a file. CURSES_HAVE_CURSES_H:FILEPATH= //The curses include path CURSES_INCLUDE_PATH:FILEPATH= //The curses library CURSES_LIBRARY:FILEPATH= //Path to a library. CURSES_NCURSES_LIBRARY:FILEPATH= Thank you very much for helping a Linux noob :) muisyle -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Setting compiler for cmake
[Please CC the cmake user's mailing list] outro pessoa outro.pes...@gmail.com writes: I'm looking at CMakeDetermineCompilerABI_C.bin and the path to /usr/local/lib/gcc46 is plain text in the elf file. Besides needing to eliminate some log files, is there a cmake argument that can be passed to clear all caches and keep the progress at the current point? Thanks muchly. Don't reuse a build directory when switching compilers. Start with an empty one. Are you experiencing difficulties with the instructions I gave you? You shouldn't care about the scripts that comes with CMake for building with Clang. The task does not require changes on those scripts. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Setting compiler for cmake
The problem is this: I am trying to port traverso-daw to FreeBSD-10.x. I have to edit the CMake variables. Since the project is not mine, I need to work with a patched version. I have tried getting in contact with the original developer. Okay, do I need to clear out the CMakeTmp files? On Sat, Oct 5, 2013 at 4:50 PM, Óscar Fuentes o...@wanadoo.es wrote: The following message is a courtesy copy of an article that has been posted to gmane.comp.programming.tools.cmake.user as well. [Please CC the cmake user's mailing list] outro pessoa outro.pes...@gmail.com writes: I'm looking at CMakeDetermineCompilerABI_C.bin and the path to /usr/local/lib/gcc46 is plain text in the elf file. Besides needing to eliminate some log files, is there a cmake argument that can be passed to clear all caches and keep the progress at the current point? Thanks muchly. Don't reuse a build directory when switching compilers. Start with an empty one. Are you experiencing difficulties with the instructions I gave you? You shouldn't care about the scripts that comes with CMake for building with Clang. The task does not require changes on those scripts. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Setting compiler for cmake
outro pessoa outro.pes...@gmail.com writes: The problem is this: I am trying to port traverso-daw to FreeBSD-10.x. I have to edit the CMake variables. Since the project is not mine, I need to work with a patched version. I have tried getting in contact with the original developer. Okay, do I need to clear out the CMakeTmp files? If you started with an empty build directory and set the compiler to clang, no, you don't need to clean anything. Why should you do? Is clang/clang++ the default compiler for FreeBSD-10? Maybe the cmake version you are using does not know about that fact and insists on using gcc/g++. If that's the problem, set CC and CXX environment variables (or CMAKE_C_COMPILER and CMAKE_CXX_COMPILER cmake variables ) as I explained on a previous message upon your *first* invocation of cmake on a clean build directory and it should just work. If it doesn't, please show the exact command you executed and its output. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4431-gda16b28
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 da16b288e1339970ec17de01f781b0d2b5c4b3fc (commit)
via e04402f002a144fa25cb5973372a226513d9b74b (commit)
from d919aa5542c23c063c998064f856a8b3f2996101 (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=da16b288e1339970ec17de01f781b0d2b5c4b3fc
commit da16b288e1339970ec17de01f781b0d2b5c4b3fc
Merge: d919aa5 e04402f
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Sat Oct 5 10:35:56 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sat Oct 5 10:35:56 2013 -0400
Merge topic 'CheckStructHasMember_CXX' into next
e04402f CheckStructHasMember: Do not use an empty struct for tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e04402f002a144fa25cb5973372a226513d9b74b
commit e04402f002a144fa25cb5973372a226513d9b74b
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Fri Oct 4 15:43:42 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Fri Oct 4 15:43:42 2013 +0200
CheckStructHasMember: Do not use an empty struct for tests
Some compilers do not accept that
diff --git a/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
b/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
index 6902c38..f06d5c3 100644
--- a/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
+++ b/Tests/CMakeOnly/CheckStructHasMember/CMakeLists.txt
@@ -14,8 +14,8 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
message(STATUS Testing configuration ${_config_type})
check_struct_has_member(struct non_existent_struct foo cm_cshm.h
CSHM_RESULT_S1_${_config_type})
-check_struct_has_member(struct struct_with_non_existent_members foo
cm_cshm.h CSHM_RESULT_S2_${_config_type})
-check_struct_has_member(struct struct_with_member foo cm_cshm.h
CSHM_RESULT_S3_${_config_type})
+check_struct_has_member(struct struct_with_member non_existent_member
cm_cshm.h CSHM_RESULT_S2_${_config_type})
+check_struct_has_member(struct struct_with_member member cm_cshm.h
CSHM_RESULT_S3_${_config_type})
if(CSHM_RESULT_S1_${_config_type} OR CSHM_RESULT_S2_${_config_type})
message(SEND_ERROR CheckStructHasMember reported a nonexistent member
as existing in configuration ${_config_type})
@@ -24,7 +24,6 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
if(NOT CSHM_RESULT_S3_${_config_type})
message(SEND_ERROR CheckStructHasMember did not report an existent
member as existing in configuration ${_config_type})
endif()
-
endforeach()
foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
@@ -35,8 +34,8 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
message(STATUS Testing configuration ${_config_type})
check_struct_has_member(struct non_existent_struct foo cm_cshm.h
CSHM_RESULT_S1_${_config_type}_C LANGUAGE C)
-check_struct_has_member(struct struct_with_non_existent_members foo
cm_cshm.h CSHM_RESULT_S2_${_config_type}_C LANGUAGE C)
-check_struct_has_member(struct struct_with_member foo cm_cshm.h
CSHM_RESULT_S3_${_config_type}_C LANGUAGE C)
+check_struct_has_member(struct struct_with_member non_existent_member
cm_cshm.h CSHM_RESULT_S2_${_config_type}_C LANGUAGE C)
+check_struct_has_member(struct struct_with_member member cm_cshm.h
CSHM_RESULT_S3_${_config_type}_C LANGUAGE C)
if(CSHM_RESULT_S1_${_config_type}_C OR CSHM_RESULT_S2_${_config_type}_C)
message(SEND_ERROR CheckStructHasMember reported a nonexistent member
as existing in configuration ${_config_type})
@@ -59,8 +58,8 @@ foreach(_config_type Release RelWithDebInfo MinSizeRel Debug)
message(STATUS Testing configuration ${_config_type})
check_struct_has_member(non_existent_struct foo cm_cshm.h
CSHM_RESULT_S1_${_config_type}_CXX LANGUAGE CXX)
-check_struct_has_member(struct_with_non_existent_members foo
cm_cshm.h CSHM_RESULT_S2_${_config_type}_CXX LANGUAGE CXX)
-check_struct_has_member(struct_with_member foo cm_cshm.h
CSHM_RESULT_S3_${_config_type}_CXX LANGUAGE CXX)
+check_struct_has_member(struct_with_non_existent_members
non_existent_member cm_cshm.h CSHM_RESULT_S2_${_config_type}_CXX LANGUAGE
CXX)
+check_struct_has_member(struct struct_with_member member cm_cshm.h
CSHM_RESULT_S3_${_config_type}_CXX LANGUAGE CXX)
check_struct_has_member(ns::non_existent_class foo cm_cshm.hxx
CSHM_RESULT_C1_${_config_type}_CXX LANGUAGE CXX)
check_struct_has_member(ns::class_with_non_existent_members foo
cm_cshm.hxx
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4438-g18ed680
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 18ed6808e8f8b793747fe833107035d79346be1c (commit) via 7eb963521008712c39b0436a50a1e680b889d504 (commit) via 209e537f668ea9fa1b3788548d73fc6a75288284 (commit) via 5e0a4eaa4e67f120fe3690c8daf9fc90b2ad1656 (commit) via 144f0722a3d94cd45fadf2cd9829a45a7883cae6 (commit) via fbc7c2df23b9c94d71e6de9e71857491cb3f6228 (commit) via dc92741d03f53be59c5e9beb7324ef5760a0a89d (commit) from da16b288e1339970ec17de01f781b0d2b5c4b3fc (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=18ed6808e8f8b793747fe833107035d79346be1c commit 18ed6808e8f8b793747fe833107035d79346be1c Merge: da16b28 7eb9635 Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Sat Oct 5 17:09:31 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Sat Oct 5 17:09:31 2013 -0400 Merge topic 'haiku-updates' into next 7eb9635 FindSDL: Fix broken include paths 209e537 Include files cleanup 5e0a4ea Remove useless preprocessor checks 144f072 Remove use of B_COMMON_DIRECTORY fbc7c2d Several fixes to Haiku platform module dc92741 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7eb963521008712c39b0436a50a1e680b889d504 commit 7eb963521008712c39b0436a50a1e680b889d504 Author: Adrien Destugues pulkoma...@pulkomandy.tk AuthorDate: Sat Oct 5 17:01:03 2013 +0200 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Sat Oct 5 23:07:17 2013 +0200 FindSDL: Fix broken include paths * I asked the CMake community about this, and they couldn't even figure out how this worked even on other platforms. diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake index fec142e..6adec1f 100644 --- a/Modules/FindSDL.cmake +++ b/Modules/FindSDL.cmake @@ -70,7 +70,7 @@ find_path(SDL_INCLUDE_DIR SDL.h HINTS ENV SDLDIR - PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include + PATH_SUFFIXES SDL SDL12 SDL11 ) # SDL-1.1 is the name used by FreeBSD ports... http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=209e537f668ea9fa1b3788548d73fc6a75288284 commit 209e537f668ea9fa1b3788548d73fc6a75288284 Author: Adrien Destugues pulkoma...@pulkomandy.tk AuthorDate: Sat Oct 5 16:59:25 2013 +0200 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Sat Oct 5 23:07:04 2013 +0200 Include files cleanup * No need to use a different path from the BeOS one, which still works. diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 14e1f50..80f131e 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -53,14 +53,10 @@ #include cm_zlib.h #include cmsys/Base64.h -#if defined(__BEOS__) +#if defined(__BEOS__) || defined(__HAIKU__) #include be/kernel/OS.h /* disable_debugger() API. */ #endif -#if defined(__HAIKU__) -#include os/kernel/OS.h /* disable_debugger() API. */ -#endif - #define DEBUGOUT std::cout __LINE__ ; std::cout #define DEBUGERR std::cerr __LINE__ ; std::cerr http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e0a4eaa4e67f120fe3690c8daf9fc90b2ad1656 commit 5e0a4eaa4e67f120fe3690c8daf9fc90b2ad1656 Author: Adrien Destugues pulkoma...@pulkomandy.tk AuthorDate: Sat Oct 5 16:33:52 2013 +0200 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Sat Oct 5 23:06:25 2013 +0200 Remove useless preprocessor checks * Haiku does not define __BEOS__ anymore, so there is no need to guard these BeOS specific workaround for Haiku. * The workaround themselves are not needed for Haiku as it has much better POSIX compatibility than BeOS did. diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c index d74a4f0..c5ba7c2 100644 --- a/Utilities/cmcurl/CMake/CurlTests.c +++ b/Utilities/cmcurl/CMake/CurlTests.c @@ -38,7 +38,7 @@ main () # define PLATFORM_AIX_V3 #endif -#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) !defined(__HAIKU__)) +#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) #error O_NONBLOCK does not work on this platform #endif int socket; diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c index 51adbcf..82f9dc2 100644 --- a/Utilities/cmcurl/select.c +++ b/Utilities/cmcurl/select.c @@ -39,7 +39,7 @@ #error We can't compile without select() support! #endif -#if defined(__BEOS__) !defined(__HAIKU__) +#if defined(__BEOS__) /* BeOS has FD_SET defined in socket.h */ #include socket.h #endif diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h index 6eb52d1..7a3b6fd
[Cmake-commits] CMake branch, master, updated. v2.8.11.2-890-g5b98d09
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, master has been updated via 5b98d09e803270e57aa9a13ad53a144b95b58abc (commit) from dc92741d03f53be59c5e9beb7324ef5760a0a89d (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=5b98d09e803270e57aa9a13ad53a144b95b58abc commit 5b98d09e803270e57aa9a13ad53a144b95b58abc Author: Kitware Robot kwro...@kitware.com AuthorDate: Sun Oct 6 00:01:10 2013 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Sun Oct 6 00:01:10 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b8b1d0d..8253468 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 11) -set(CMake_VERSION_TWEAK 20131005) +set(CMake_VERSION_TWEAK 20131006) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4440-gebc6799
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 ebc6799ac610d0671666b1001fb81d9f1cd4f022 (commit)
via 9a6e363d964beaa2714d43868a4836b606a869e3 (commit)
from 18ed6808e8f8b793747fe833107035d79346be1c (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=ebc6799ac610d0671666b1001fb81d9f1cd4f022
commit ebc6799ac610d0671666b1001fb81d9f1cd4f022
Merge: 18ed680 9a6e363
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Sun Oct 6 01:32:45 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Sun Oct 6 01:32:45 2013 -0400
Merge topic 'haiku-updates' into next
9a6e363 fix line length
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a6e363d964beaa2714d43868a4836b606a869e3
commit 9a6e363d964beaa2714d43868a4836b606a869e3
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Sun Oct 6 07:32:18 2013 +0200
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Sun Oct 6 07:32:18 2013 +0200
fix line length
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index e6166cb..bd233f7 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -352,7 +352,8 @@ void cmLocalGenerator::GenerateInstallRules()
char dir[B_PATH_NAME_LENGTH];
if (!prefix)
{
-if (find_directory(B_SYSTEM_DIRECTORY, -1, false, dir, sizeof(dir)) ==
B_OK)
+if (find_directory(B_SYSTEM_DIRECTORY, -1, false, dir, sizeof(dir))
+== B_OK)
{
prefix = dir;
}
---
Summary of changes:
Source/cmLocalGenerator.cxx |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4447-ge39d7fc
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 e39d7fcd7280103a919041c5961b3fec0934aa60 (commit) via eac2adb5b46277be16ac2e577e369bdcd4c93339 (commit) via 98c44a731e62196ece95babde3da6d4363be83b5 (commit) via 72142cb7b3b5d0dcb198a00be029e050d4087797 (commit) via 75ca84db871a21f56a796e3d5e9783a903a907b4 (commit) via e078ce19217f9457ce3a2d9ada570d18eefeff60 (commit) via 5b98d09e803270e57aa9a13ad53a144b95b58abc (commit) from ebc6799ac610d0671666b1001fb81d9f1cd4f022 (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=e39d7fcd7280103a919041c5961b3fec0934aa60 commit e39d7fcd7280103a919041c5961b3fec0934aa60 Merge: ebc6799 eac2adb Author: Rolf Eike Beer e...@sf-mail.de AuthorDate: Sun Oct 6 01:34:24 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Sun Oct 6 01:34:24 2013 -0400 Merge topic 'haiku-updates' into next eac2adb FindSDL: Fix broken include paths 98c44a7 Include files cleanup 72142cb Remove useless preprocessor checks 75ca84d Remove use of B_COMMON_DIRECTORY e078ce1 Several fixes to Haiku platform module 5b98d09 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eac2adb5b46277be16ac2e577e369bdcd4c93339 commit eac2adb5b46277be16ac2e577e369bdcd4c93339 Author: Adrien Destugues pulkoma...@pulkomandy.tk AuthorDate: Sat Oct 5 17:01:03 2013 +0200 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Sun Oct 6 07:33:48 2013 +0200 FindSDL: Fix broken include paths * I asked the CMake community about this, and they couldn't even figure out how this worked even on other platforms. diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake index fec142e..6adec1f 100644 --- a/Modules/FindSDL.cmake +++ b/Modules/FindSDL.cmake @@ -70,7 +70,7 @@ find_path(SDL_INCLUDE_DIR SDL.h HINTS ENV SDLDIR - PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include + PATH_SUFFIXES SDL SDL12 SDL11 ) # SDL-1.1 is the name used by FreeBSD ports... http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98c44a731e62196ece95babde3da6d4363be83b5 commit 98c44a731e62196ece95babde3da6d4363be83b5 Author: Adrien Destugues pulkoma...@pulkomandy.tk AuthorDate: Sat Oct 5 16:59:25 2013 +0200 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Sun Oct 6 07:33:48 2013 +0200 Include files cleanup * No need to use a different path from the BeOS one, which still works. diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 14e1f50..80f131e 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -53,14 +53,10 @@ #include cm_zlib.h #include cmsys/Base64.h -#if defined(__BEOS__) +#if defined(__BEOS__) || defined(__HAIKU__) #include be/kernel/OS.h /* disable_debugger() API. */ #endif -#if defined(__HAIKU__) -#include os/kernel/OS.h /* disable_debugger() API. */ -#endif - #define DEBUGOUT std::cout __LINE__ ; std::cout #define DEBUGERR std::cerr __LINE__ ; std::cerr http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72142cb7b3b5d0dcb198a00be029e050d4087797 commit 72142cb7b3b5d0dcb198a00be029e050d4087797 Author: Adrien Destugues pulkoma...@pulkomandy.tk AuthorDate: Sat Oct 5 16:33:52 2013 +0200 Commit: Rolf Eike Beer e...@sf-mail.de CommitDate: Sun Oct 6 07:33:48 2013 +0200 Remove useless preprocessor checks * Haiku does not define __BEOS__ anymore, so there is no need to guard these BeOS specific workaround for Haiku. * The workaround themselves are not needed for Haiku as it has much better POSIX compatibility than BeOS did. diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c index d74a4f0..c5ba7c2 100644 --- a/Utilities/cmcurl/CMake/CurlTests.c +++ b/Utilities/cmcurl/CMake/CurlTests.c @@ -38,7 +38,7 @@ main () # define PLATFORM_AIX_V3 #endif -#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) !defined(__HAIKU__)) +#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) #error O_NONBLOCK does not work on this platform #endif int socket; diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c index 51adbcf..82f9dc2 100644 --- a/Utilities/cmcurl/select.c +++ b/Utilities/cmcurl/select.c @@ -39,7 +39,7 @@ #error We can't compile without select() support! #endif -#if defined(__BEOS__) !defined(__HAIKU__) +#if defined(__BEOS__) /* BeOS has FD_SET defined in socket.h */ #include socket.h #endif diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h index 6eb52d1..7a3b6fd
