diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-08 17:06:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-08 17:06:14 (GMT) |
| commit | f401b925cf1711d4b77b1039204cb78c10b9252d (patch) | |
| tree | 4c2532a4c9acf42def829696511e4d554c16e342 /Source/kwsys | |
| parent | 9b1abc543e9aee946e093229e1715c4b8a961514 (diff) | |
| parent | c54be58309fbf9c2a5cfec8ba190c631e1db4a6c (diff) | |
| download | CMake-f401b925cf1711d4b77b1039204cb78c10b9252d.zip CMake-f401b925cf1711d4b77b1039204cb78c10b9252d.tar.gz CMake-f401b925cf1711d4b77b1039204cb78c10b9252d.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Source/kwsys/MD5.c | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 977d57b..5e6a226 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/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/Source/kwsys/MD5.c b/Source/kwsys/MD5.c index 56776a3..a147057 100644 --- a/Source/kwsys/MD5.c +++ b/Source/kwsys/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); } /*--------------------------------------------------------------------------*/ |