[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 AuthorDate: Sun Oct 6 01:34:24 2013 -0400 Commit: CMake Topic Stage 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 AuthorDate: Sat Oct 5 17:01:03 2013 +0200 Commit: Rolf Eike Beer 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 AuthorDate: Sat Oct 5 16:59:25 2013 +0200 Commit: Rolf Eike Beer 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 #include -#if defined(__BEOS__) +#if defined(__BEOS__) || defined(__HAIKU__) #include/* disable_debugger() API. */ #endif -#if defined(__HAIKU__) -#include/* 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 AuthorDate: Sat Oct 5 16:33:52 2013 +0200 Commit: Rolf Eike Beer 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 #endif diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h index 6eb52d1..7a3b6fd 100644 --- a/Utilities/cmzlib/zconf.h +++ b/Utilities/cmzlib/zconf.h @@ -237,7 +237,7 @@ # endif #endif -#if defined (__BEOS__) && !defined (__HAIKU__) +#if defined (__BEOS__) # ifd
[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
AuthorDate: Sun Oct 6 01:32:45 2013 -0400
Commit: CMake Topic Stage
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
AuthorDate: Sun Oct 6 07:32:18 2013 +0200
Commit: Rolf Eike Beer
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, 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 AuthorDate: Sun Oct 6 00:01:10 2013 -0400 Commit: Kitware Robot 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-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 AuthorDate: Sat Oct 5 17:09:31 2013 -0400 Commit: CMake Topic Stage 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 AuthorDate: Sat Oct 5 17:01:03 2013 +0200 Commit: Rolf Eike Beer 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 AuthorDate: Sat Oct 5 16:59:25 2013 +0200 Commit: Rolf Eike Beer 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 #include -#if defined(__BEOS__) +#if defined(__BEOS__) || defined(__HAIKU__) #include/* disable_debugger() API. */ #endif -#if defined(__HAIKU__) -#include/* 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 AuthorDate: Sat Oct 5 16:33:52 2013 +0200 Commit: Rolf Eike Beer 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 #endif diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h index 6eb52d1..7a3b6fd 100644 --- a/Utilities/cmzlib/zconf.h +++ b/Utilities/cmzlib/zconf.h @@ -237,7 +237,7 @@ # endif #endif -#if defined (__BEOS__) && !defined (__HAIKU__) +#if defined (__BEOS__) # ifd
[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
AuthorDate: Sat Oct 5 10:35:56 2013 -0400
Commit: CMake Topic Stage
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
AuthorDate: Fri Oct 4 15:43:42 2013 +0200
Commit: Daniele E. Domenichelli
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" CS
