diff options
| author | Brad King <brad.king@kitware.com> | 2023-11-28 22:49:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-12-01 15:10:51 (GMT) |
| commit | 6a5a9278faaeba5834bf1d7c969d7a175d9e47c8 (patch) | |
| tree | 7fbaa9751a9c6e773005dbaf1d27d68be32b848a | |
| parent | 54eafb156f46badce53c3b443ec11824cef5f55b (diff) | |
| download | CMake-6a5a9278faaeba5834bf1d7c969d7a175d9e47c8.zip CMake-6a5a9278faaeba5834bf1d7c969d7a175d9e47c8.tar.gz CMake-6a5a9278faaeba5834bf1d7c969d7a175d9e47c8.tar.bz2 | |
librhash: Update build within CMake for rhash 1.4.4
| -rw-r--r-- | Utilities/cmlibrhash/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | bootstrap | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Utilities/cmlibrhash/CMakeLists.txt b/Utilities/cmlibrhash/CMakeLists.txt index 9f532ad..317c5f8 100644 --- a/Utilities/cmlibrhash/CMakeLists.txt +++ b/Utilities/cmlibrhash/CMakeLists.txt @@ -28,6 +28,7 @@ set(librhash_sources librhash/sha512.c librhash/sha512.h librhash/ustd.h + librhash/util.c librhash/util.h ) @@ -36,5 +37,6 @@ include_directories( ) add_library(cmlibrhash ${librhash_sources}) +target_compile_definitions(cmlibrhash PRIVATE NO_IMPORT_EXPORT) install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibrhash) @@ -594,6 +594,7 @@ LIBRHASH_C_SOURCES="\ librhash/sha256.c \ librhash/sha3.c \ librhash/sha512.c \ + librhash/util.c \ " JSONCPP_CXX_SOURCES="\ @@ -1792,6 +1793,7 @@ else libs="${libs} -luv" fi +librhash_c_flags="-DNO_IMPORT_EXPORT" if test "x${bootstrap_system_librhash}" != "x"; then if test `which pkg-config`; then use_librhash_flags="`pkg-config --cflags librhash`" @@ -1946,7 +1948,7 @@ fi if test "x${bootstrap_system_librhash}" = "x"; then for a in ${LIBRHASH_C_SOURCES}; do src=`cmake_escape_artifact "${cmake_source_dir}/Utilities/cmlibrhash/${a}"` - write_source_rule "c" "rhash-`cmake_obj ${a}`" "${src}" "" + write_source_rule "c" "rhash-`cmake_obj ${a}`" "${src}" "${librhash_c_flags}" done fi if test "x${bootstrap_system_jsoncpp}" = "x"; then |