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 5368f212a9c27cbd8eaed20d9c580459fb258104 (commit) via fd63722dc86ec30e8a6f543881d56b3c473da34d (commit) from c7244c6b863d3a670e8aa0a032173cf334556be9 (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=5368f212a9c27cbd8eaed20d9c580459fb258104 commit 5368f212a9c27cbd8eaed20d9c580459fb258104 Merge: c7244c6 fd63722 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Jul 17 09:41:59 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jul 17 09:41:59 2014 -0400 Merge topic 'compile-with-cray' into next fd63722d cmcurl: Fix a build failure with the Cray compiler on Linux (#15026) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd63722dc86ec30e8a6f543881d56b3c473da34d commit fd63722dc86ec30e8a6f543881d56b3c473da34d Author: Chuck Atkins <chuck.atk...@kitware.com> AuthorDate: Wed Jul 16 09:04:42 2014 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Jul 17 09:43:05 2014 -0400 cmcurl: Fix a build failure with the Cray compiler on Linux (#15026) The error is caused by a workaround for UNICOS. The workaround incorrectly uses the _CRAYC macro to determine if building for UNICOS. This macro will always be defined for the Cray C and C++ compiler regardless of the target platform, even when building for Linux. The correct macro should be _CRAY, which as per Cray documentation is only defined for UNICOS targeted builds. diff --git a/Utilities/cmcurl/hostip.c b/Utilities/cmcurl/hostip.c index fd555ef..83f1564 100644 --- a/Utilities/cmcurl/hostip.c +++ b/Utilities/cmcurl/hostip.c @@ -609,7 +609,7 @@ Curl_addrinfo *Curl_ip2addr(in_addr_t num, const char *hostname, int port) h = &buf->hostentry; h->h_addr_list = &buf->h_addr_list[0]; addrentry = &buf->addrentry; -#ifdef _CRAYC +#ifdef _CRAY /* On UNICOS, s_addr is a bit field and for some reason assigning to it * doesn't work. There must be a better fix than this ugly hack. */ ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits