diff --git a/.gitmodules b/.gitmodules index e535465c..c08da2e2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ url = https://gitlab.com/PBSA/tools-libs/peerplays-fc.git branch = latest-fc ignore = dirty +[submodule "libraries/vendor/SHA3IUF/SHA3IUF"] + path = libraries/vendor/SHA3IUF/SHA3IUF + url = https://github.com/brainhub/SHA3IUF.git diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt index cf2355f1..dfe3d397 100644 --- a/libraries/CMakeLists.txt +++ b/libraries/CMakeLists.txt @@ -1,3 +1,4 @@ +add_subdirectory( vendor ) add_subdirectory( app ) add_subdirectory( chain ) add_subdirectory( db ) diff --git a/libraries/fc b/libraries/fc index 101a1714..e7369949 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit 101a1714de4e241b80945c4c53c36e07caae4c0b +Subproject commit e7369949bea26f3201d8442ba78286a88df74762 diff --git a/libraries/plugins/peerplays_sidechain/CMakeLists.txt b/libraries/plugins/peerplays_sidechain/CMakeLists.txt index 57a91935..44c0a8e3 100755 --- a/libraries/plugins/peerplays_sidechain/CMakeLists.txt +++ b/libraries/plugins/peerplays_sidechain/CMakeLists.txt @@ -39,9 +39,11 @@ endif() unset(ENABLE_PEERPLAYS_ASSET_DEPOSITS) unset(ENABLE_PEERPLAYS_ASSET_DEPOSITS CACHE) -target_link_libraries( peerplays_sidechain PRIVATE curl graphene_plugin zmq ) -target_include_directories( peerplays_sidechain - PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" ) +target_link_directories( peerplays_sidechain PUBLIC ${SHA3IUF_link_dirs} ) +target_link_libraries( peerplays_sidechain PRIVATE curl graphene_plugin zmq ${SHA3IUF_libraries} ) +target_include_directories( peerplays_sidechain PUBLIC + "${CMAKE_CURRENT_SOURCE_DIR}/include" + "${SHA3IUF_include_dirs}" ) install( TARGETS peerplays_sidechain diff --git a/libraries/vendor/CMakeLists.txt b/libraries/vendor/CMakeLists.txt new file mode 100755 index 00000000..c423bd66 --- /dev/null +++ b/libraries/vendor/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( SHA3IUF ) \ No newline at end of file diff --git a/libraries/vendor/SHA3IUF/CMakeLists.txt b/libraries/vendor/SHA3IUF/CMakeLists.txt new file mode 100755 index 00000000..0666d7ed --- /dev/null +++ b/libraries/vendor/SHA3IUF/CMakeLists.txt @@ -0,0 +1,26 @@ +PROJECT( SHA3IUF ) + +include(ExternalProject) + +ExternalProject_Add(project_SHA3IUF + PREFIX ${CMAKE_CURRENT_BINARY_DIR} + SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF + CONFIGURE_COMMAND cp -R ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF/. ${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build + BUILD_COMMAND make + INSTALL_COMMAND true + BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX} + LOG_BUILD ON +) + +ExternalProject_Get_Property(project_SHA3IUF binary_dir) +add_library(SHA3IUF STATIC IMPORTED) +message(STATUS "Setting up SHA3IUF to ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX}") +set_property(TARGET SHA3IUF PROPERTY IMPORTED_LOCATION ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX}) +set_property(TARGET SHA3IUF PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/SHA3IUF) + +add_dependencies(SHA3IUF project_SHA3IUF) +install( FILES ${binary_dir}/libsha3${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION lib ) + +set(SHA3IUF_libraries sha3 CACHE INTERNAL "") +set(SHA3IUF_include_dirs "${CMAKE_CURRENT_LIST_DIR}/SHA3IUF" CACHE INTERNAL "") +set(SHA3IUF_link_dirs "${CMAKE_CURRENT_BINARY_DIR}/src/project_SHA3IUF-build" CACHE INTERNAL "") \ No newline at end of file diff --git a/libraries/vendor/SHA3IUF/SHA3IUF b/libraries/vendor/SHA3IUF/SHA3IUF new file mode 160000 index 00000000..fc850475 --- /dev/null +++ b/libraries/vendor/SHA3IUF/SHA3IUF @@ -0,0 +1 @@ +Subproject commit fc8504750a5c2174a1874094dd05e6a0d8797753