From 1c1ae8848852e50a6a46b030fd4b141330c93c11 Mon Sep 17 00:00:00 2001 From: Vlad Dobromyslov Date: Tue, 16 Aug 2022 10:30:14 +0300 Subject: [PATCH] Delete submodule SHA3IUF --- .gitmodules | 4 ---- libraries/CMakeLists.txt | 1 - libraries/vendor/CMakeLists.txt | 26 -------------------------- libraries/vendor/SHA3IUF | 1 - 4 files changed, 32 deletions(-) delete mode 100755 libraries/vendor/CMakeLists.txt delete mode 160000 libraries/vendor/SHA3IUF diff --git a/.gitmodules b/.gitmodules index 8a25db68..d9c387a6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,7 +7,3 @@ url = https://gitlab.com/PBSA/tools-libs/peerplays-fc.git branch = develop ignore = dirty -[submodule "libraries/vendor/SHA3IUF"] - path = libraries/vendor/SHA3IUF - url = https://github.com/brainhub/SHA3IUF.git - branch = master diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt index dfe3d397..cf2355f1 100644 --- a/libraries/CMakeLists.txt +++ b/libraries/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory( vendor ) add_subdirectory( app ) add_subdirectory( chain ) add_subdirectory( db ) diff --git a/libraries/vendor/CMakeLists.txt b/libraries/vendor/CMakeLists.txt deleted file mode 100755 index 6047e95e..00000000 --- a/libraries/vendor/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -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 "") diff --git a/libraries/vendor/SHA3IUF b/libraries/vendor/SHA3IUF deleted file mode 160000 index fc850475..00000000 --- a/libraries/vendor/SHA3IUF +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fc8504750a5c2174a1874094dd05e6a0d8797753