diff options
author | Brad King <brad.king@kitware.com> | 2016-11-03 15:18:37 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-11-10 13:26:54 (GMT) |
commit | 31bb727f3b239b541e1ff5679b3c461e9a05f227 (patch) | |
tree | 6bbc228075d0546e9cd51e0858c66b7e83f122fb | |
parent | 53048afa8dc24327d82a1ff0f78801e1f344a4b6 (diff) | |
download | CMake-31bb727f3b239b541e1ff5679b3c461e9a05f227.zip CMake-31bb727f3b239b541e1ff5679b3c461e9a05f227.tar.gz CMake-31bb727f3b239b541e1ff5679b3c461e9a05f227.tar.bz2 |
librhash: Build the library within CMake
Update `ustd.h` to include KWSys Large File Support configuration so
that consistent stream libraries are used (on AIX with XL).
Add a `cm_rhash.h` header to include the CMake-provided copy of the
`rhash.h` header from CMake sources.
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | Source/CMakeLists.txt | 1 | ||||
-rw-r--r-- | Utilities/cm_rhash.h | 8 | ||||
-rw-r--r-- | Utilities/cmlibrhash/CMakeLists.txt | 28 | ||||
-rw-r--r-- | Utilities/cmlibrhash/librhash/ustd.h | 3 |
5 files changed, 44 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a5702e1..82a34d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -298,6 +298,10 @@ macro (CMAKE_BUILD_UTILITIES) add_subdirectory(Utilities/KWIML) endif() + set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash) + add_subdirectory(Utilities/cmlibrhash) + CMAKE_SET_TARGET_FOLDER(cmlibrhash "Utilities/3rdParty") + #--------------------------------------------------------------------- # Build zlib library for Curl, CMake, and CTest. set(CMAKE_ZLIB_HEADER "cm_zlib.h") diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index cf9dbb8..879272c 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -788,6 +788,7 @@ target_link_libraries(CMakeLib cmsys ${CMAKE_CURL_LIBRARIES} ${CMAKE_JSONCPP_LIBRARIES} ${CMAKE_LIBUV_LIBRARIES} + ${CMAKE_LIBRHASH_LIBRARIES} ${CMake_KWIML_LIBRARIES} ) diff --git a/Utilities/cm_rhash.h b/Utilities/cm_rhash.h new file mode 100644 index 0000000..23d5409 --- /dev/null +++ b/Utilities/cm_rhash.h @@ -0,0 +1,8 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ +#ifndef cm_rhash_h +#define cm_rhash_h + +#include <cmlibrhash/librhash/rhash.h> + +#endif diff --git a/Utilities/cmlibrhash/CMakeLists.txt b/Utilities/cmlibrhash/CMakeLists.txt new file mode 100644 index 0000000..47d069a --- /dev/null +++ b/Utilities/cmlibrhash/CMakeLists.txt @@ -0,0 +1,28 @@ +project(librhash C) + +set(librhash_sources + librhash/algorithms.c + librhash/algorithms.h + librhash/byte_order.c + librhash/byte_order.h + librhash/hex.c + librhash/hex.h + librhash/md5.c + librhash/md5.h + librhash/rhash.c + librhash/rhash.h + librhash/sha1.c + librhash/sha1.h + librhash/sha256.c + librhash/sha256.h + librhash/sha512.c + librhash/sha512.h + librhash/ustd.h + librhash/util.h + ) + +include_directories( + ${KWSYS_HEADER_ROOT} + ) + +add_library(cmlibrhash ${librhash_sources}) diff --git a/Utilities/cmlibrhash/librhash/ustd.h b/Utilities/cmlibrhash/librhash/ustd.h index 94f1ae2..38c4e3e 100644 --- a/Utilities/cmlibrhash/librhash/ustd.h +++ b/Utilities/cmlibrhash/librhash/ustd.h @@ -2,6 +2,9 @@ #ifndef LIBRHASH_USTD_H #define LIBRHASH_USTD_H +/* Include KWSys Large File Support configuration. */ +#include <cmsys/Configure.h> + #if _MSC_VER >= 1300 # define int64_t __int64 |