[Cmake-commits] CMake branch, next, updated. v3.0.0-4719-geb2eb78

[Brad King]

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  eb2eb7840ae2706aadeb9e8015656ed03843acd1 (commit)
       via  2dd17a546f0a2dafacf53b5db1e9ead0990d91ea (commit)
      from  1a1f6526f308d87a22071539acda3a6da49d9e82 (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=eb2eb7840ae2706aadeb9e8015656ed03843acd1
commit eb2eb7840ae2706aadeb9e8015656ed03843acd1
Merge: 1a1f652 2dd17a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 4 10:13:04 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 4 10:13:04 2014 -0400

    Merge topic 'liblzma-pgi-compiler' into next
    
    2dd17a54 liblzma: Fix compilation with PGI compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dd17a546f0a2dafacf53b5db1e9ead0990d91ea
commit 2dd17a546f0a2dafacf53b5db1e9ead0990d91ea
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Fri Aug 1 13:56:41 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 4 10:12:51 2014 -0400

    liblzma: Fix compilation with PGI compiler
    
    - sha265.c is using some C99 specific features, in particular static
    array dimensions in a function parameter array (see section 6.7.5-7
    of the C99 spec).  A #ifndef check was in place to prevent compilation
    under MSVC but it actually needed to check for C99 compliance instead.
    Even still, the C99 code fails on a few compilers (PGI being one) so for
    compatibility reasons, the C99 version of the function declaration is
    removed entirely, leaving only the C89 version.
    
    - CHECK_SYMBOL_EXISTS is used to determine the presense of bswap
    functions from byteswap.h.  Most compilers re-dedefine the bswap_N
    functions as a __bswap_N function implemented by the compiler.  Since
    bswap_N is usually defined as a macro then it's mere presence passes
    the check.  Some versions of the PGI compiler though have shipped
    broken headers for byteswap.h, in particular 11.3 for x64 linux
    provides byteswap.h but is missing an associated bits/byteswap.h which
    causes some of the bswap_N macros to be defined but broken and unusable.
    The bswap_N checks have been converted to CHECK_SOURCE_COMPILES to
    ensure that the bswap_N calls are actually usable and not just merely
    defined.

diff --git a/Utilities/cmliblzma/CMakeLists.txt b/Utilities/cmliblzma/CMakeLists.txt
index fc50dbe..856e41e 100644
--- a/Utilities/cmliblzma/CMakeLists.txt
+++ b/Utilities/cmliblzma/CMakeLists.txt
@@ -31,9 +31,15 @@ CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
 CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
 CHECK_INCLUDE_FILE(sys/sysctl.h HAVE_SYS_SYSCTL_H)
 
-CHECK_SYMBOL_EXISTS(bswap_16 byteswap.h HAVE_BSWAP_16)
-CHECK_SYMBOL_EXISTS(bswap_32 byteswap.h HAVE_BSWAP_32)
-CHECK_SYMBOL_EXISTS(bswap_64 byteswap.h HAVE_BSWAP_64)
+CHECK_C_SOURCE_COMPILES (
+  "#include<byteswap.h>\nint main(void){bswap_16(0);return 0;}"
+  HAVE_BSWAP_16)
+CHECK_C_SOURCE_COMPILES (
+  "#include<byteswap.h>\nint main(void){bswap_32(0);return 0;}"
+  HAVE_BSWAP_32)
+CHECK_C_SOURCE_COMPILES (
+  "#include<byteswap.h>\nint main(void){bswap_64(0);return 0;}"
+  HAVE_BSWAP_64)
 
 TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
 
diff --git a/Utilities/cmliblzma/liblzma/check/sha256.c b/Utilities/cmliblzma/liblzma/check/sha256.c
index b09ccbf..c2c85eb 100644
--- a/Utilities/cmliblzma/liblzma/check/sha256.c
+++ b/Utilities/cmliblzma/liblzma/check/sha256.c
@@ -80,11 +80,7 @@ static const uint32_t SHA256_K[64] = {
 
 
 static void
-#ifndef _MSC_VER
-transform(uint32_t state[static 8], const uint32_t data[static 16])
-#else
 transform(uint32_t state[], const uint32_t data[])
-#endif
 {
 	uint32_t W[16];
 	uint32_t T[8];

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmliblzma/CMakeLists.txt         |   12 +++++++++---
 Utilities/cmliblzma/liblzma/check/sha256.c |    4 ----
 2 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake