Skip to content

Commit

Permalink
Update ed25519 repository and commit
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Vaneev <[email protected]>
  • Loading branch information
Warchant committed Feb 5, 2018
1 parent fa82a07 commit cef7df4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions cmake/Modules/Finded25519.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@ find_package_handle_standard_args(ed25519 DEFAULT_MSG
ed25519_LIBRARY
)

set(URL https://github.com/warchant/ed25519.git)
set(VERSION 56d926c4489aa7b2bb664a48294c5ee2d6e1c283)
set(URL https://github.com/hyperledger/iroha-ed25519)
set(VERSION e7188b8393dbe5ac54378610d53630bd4a180038)
set_target_description(ed25519 "Digital signature algorithm" ${URL} ${VERSION})

if (NOT ed25519_FOUND)
externalproject_add(warchant_ed25519
externalproject_add(hyperledger_ed25519
GIT_REPOSITORY ${URL}
GIT_TAG ${VERSION}
CMAKE_ARGS -DTESTING=OFF -DBUILD=STATIC
INSTALL_COMMAND "" # remove install step
TEST_COMMAND "" # remove test step
UPDATE_COMMAND "" # remove update step
)
externalproject_get_property(warchant_ed25519 binary_dir)
externalproject_get_property(warchant_ed25519 source_dir)
externalproject_get_property(hyperledger_ed25519 binary_dir)
externalproject_get_property(hyperledger_ed25519 source_dir)
set(ed25519_INCLUDE_DIR ${source_dir}/include)
set(ed25519_LIBRARY ${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}ed25519${CMAKE_STATIC_LIBRARY_SUFFIX})
file(MAKE_DIRECTORY ${ed25519_INCLUDE_DIR})
link_directories(${binary_dir})

add_dependencies(ed25519 warchant_ed25519)
add_dependencies(ed25519 hyperledger_ed25519)
endif ()

set_target_properties(ed25519 PROPERTIES
Expand Down
4 changes: 2 additions & 2 deletions docker/develop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ RUN git clone git://sourceware.org/git/valgrind.git /tmp/valgrind; \
rm -rf /tmp/valgrind

# install ed25519
RUN git clone git://github.com/warchant/ed25519.git /tmp/ed25519; \
(cd /tmp/ed25519 ; git checkout 56d926c4489aa7b2bb664a48294c5ee2d6e1c283); \
RUN git clone git://github.com/hyperledger/iroha-ed25519.git /tmp/ed25519; \
(cd /tmp/ed25519 ; git checkout e7188b8393dbe5ac54378610d53630bd4a180038); \
cmake -DCMAKE_BUILD_TYPE=Debug -DTESTING=OFF -H/tmp/ed25519 -B/tmp/ed25519/build; \
cmake --build /tmp/ed25519/build --target install -- -j${PARALLELISM}; \
ldconfig; \
Expand Down

0 comments on commit cef7df4

Please sign in to comment.