[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2153-g19ef804

[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  19ef8048be624cde670218cb3cc878597c7f108f (commit)
       via  f401b925cf1711d4b77b1039204cb78c10b9252d (commit)
       via  c54be58309fbf9c2a5cfec8ba190c631e1db4a6c (commit)
       via  9b1abc543e9aee946e093229e1715c4b8a961514 (commit)
      from  c48fa9ac1355fe7f754e7dbd6a8cdcb17a5a8c09 (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=19ef8048be624cde670218cb3cc878597c7f108f
commit 19ef8048be624cde670218cb3cc878597c7f108f
Merge: c48fa9a f401b92
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 8 13:07:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 8 13:07:38 2014 -0400

    Merge topic 'update-kwsys' into next
    
    f401b925 Merge branch 'upstream-kwsys' into update-kwsys
    c54be583 KWSys 2014-04-07 (8b085635)
    9b1abc54 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f401b925cf1711d4b77b1039204cb78c10b9252d
commit f401b925cf1711d4b77b1039204cb78c10b9252d
Merge: 9b1abc5 c54be58
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 8 13:06:14 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 8 13:06:14 2014 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c54be58309fbf9c2a5cfec8ba190c631e1db4a6c
commit c54be58309fbf9c2a5cfec8ba190c631e1db4a6c
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Mon Apr 7 09:49:13 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 8 13:06:10 2014 -0400

    KWSys 2014-04-07 (8b085635)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 8b085635 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 39f98b5d..8b085635
    Rolf Eike Beer (2):
          a99a9235 set the compile flags for older HP compilers to fix compilation
          8b085635 MD5: avoid casting back and forth between size_t and int
    
    Change-Id: I6386b521dbaba2e4f9ed5b2be34a504b9c17fc36

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 977d57b..5e6a226 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,6 +299,13 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX)
   ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
   IF(CMAKE_SYSTEM MATCHES "HP-UX")
     SET(KWSYS_PLATFORM_CXX_TEST_EXTRA_FLAGS "+p")
+    IF(CMAKE_CXX_COMPILER_ID MATCHES "HP")
+      # it is known that version 3.85 fails and 6.25 works without these flags
+      IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4)
+        # use new C++ library and improved template support
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -AA +hpxstd98")
+      ENDIF()
+    ENDIF()
   ENDIF(CMAKE_SYSTEM MATCHES "HP-UX")
 ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX)
 
diff --git a/MD5.c b/MD5.c
index 56776a3..a147057 100644
--- a/MD5.c
+++ b/MD5.c
@@ -478,11 +478,16 @@ void kwsysMD5_Initialize(kwsysMD5* md5)
 /*--------------------------------------------------------------------------*/
 void kwsysMD5_Append(kwsysMD5* md5, unsigned char const* data, int length)
 {
+  size_t dlen;
   if(length < 0)
     {
-    length = (int)strlen((char const*)data);
+    dlen = strlen((char const*)data);
     }
-  md5_append(&md5->md5_state, (md5_byte_t const*)data, (size_t)length);
+  else
+    {
+    dlen = (size_t)length;
+    }
+  md5_append(&md5->md5_state, (md5_byte_t const*)data, dlen);
 }
 
 /*--------------------------------------------------------------------------*/

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

Summary of changes:
 Source/CMakeVersion.cmake   |    2 +-
 Source/kwsys/CMakeLists.txt |    7 +++++++
 Source/kwsys/MD5.c          |    9 +++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake