From 7095278262703bb993b727b855887ff85d0be304 Mon Sep 17 00:00:00 2001 From: Mikhail Komarov Date: Sat, 24 Feb 2024 20:15:32 +0000 Subject: [PATCH] Missing dependencies introduced. --- CMakeLists.txt | 97 ++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d119f4..7bd71de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,54 +24,51 @@ if(NOT Boost_FOUND AND NOT CMAKE_CROSSCOMPILING) cm_find_package(Boost REQUIRED) endif() -cm_find_package(${CMAKE_WORKSPACE_NAME}_algebra) -cm_find_package(${CMAKE_WORKSPACE_NAME}_pkpad) -cm_find_package(${CMAKE_WORKSPACE_NAME}_zk) - option(BUILD_TESTS "Build unit tests" FALSE) option(BUILD_EXAMPLES "Build examples" FALSE) list(APPEND ${CURRENT_PROJECT_NAME}_LIBRARIES - ${CMAKE_WORKSPACE_NAME}::algebra - # TODO: add conditional link of zk depending on ElGamal - ${CMAKE_WORKSPACE_NAME}::zk) + ${CMAKE_WORKSPACE_NAME}::algebra + ${CMAKE_WORKSPACE_NAME}::random + # TODO: add conditional link of zk depending on ElGamal + ${CMAKE_WORKSPACE_NAME}::zk) list(APPEND ${CURRENT_PROJECT_NAME}_PUBLIC_HEADERS - include/nil/crypto3/pubkey/algorithm/sign.hpp - include/nil/crypto3/pubkey/algorithm/verify.hpp - include/nil/crypto3/pubkey/algorithm/aggregate.hpp - include/nil/crypto3/pubkey/algorithm/aggregate_verify.hpp - include/nil/crypto3/pubkey/algorithm/aggregate_verify_single_msg.hpp - include/nil/crypto3/pubkey/algorithm/deal_shares.hpp - include/nil/crypto3/pubkey/algorithm/deal_share.hpp - include/nil/crypto3/pubkey/algorithm/verify_share.hpp - include/nil/crypto3/pubkey/algorithm/reconstruct_secret.hpp - include/nil/crypto3/pubkey/algorithm/reconstruct_public_secret.hpp - - include/nil/crypto3/pubkey/keys/private_key.hpp - include/nil/crypto3/pubkey/keys/public_key.hpp - include/nil/crypto3/pubkey/keys/share_sss.hpp - include/nil/crypto3/pubkey/keys/public_share_sss.hpp - include/nil/crypto3/pubkey/keys/secret_sss.hpp - include/nil/crypto3/pubkey/keys/public_secret_sss.hpp - - include/nil/crypto3/pubkey/modes/isomorphic.hpp - - include/nil/crypto3/pubkey/bls.hpp - include/nil/crypto3/pubkey/ecdsa.hpp - include/nil/crypto3/pubkey/eddsa.hpp - - include/nil/crypto3/pubkey/type_traits.hpp) + include/nil/crypto3/pubkey/algorithm/sign.hpp + include/nil/crypto3/pubkey/algorithm/verify.hpp + include/nil/crypto3/pubkey/algorithm/aggregate.hpp + include/nil/crypto3/pubkey/algorithm/aggregate_verify.hpp + include/nil/crypto3/pubkey/algorithm/aggregate_verify_single_msg.hpp + include/nil/crypto3/pubkey/algorithm/deal_shares.hpp + include/nil/crypto3/pubkey/algorithm/deal_share.hpp + include/nil/crypto3/pubkey/algorithm/verify_share.hpp + include/nil/crypto3/pubkey/algorithm/reconstruct_secret.hpp + include/nil/crypto3/pubkey/algorithm/reconstruct_public_secret.hpp + + include/nil/crypto3/pubkey/keys/private_key.hpp + include/nil/crypto3/pubkey/keys/public_key.hpp + include/nil/crypto3/pubkey/keys/share_sss.hpp + include/nil/crypto3/pubkey/keys/public_share_sss.hpp + include/nil/crypto3/pubkey/keys/secret_sss.hpp + include/nil/crypto3/pubkey/keys/public_secret_sss.hpp + + include/nil/crypto3/pubkey/modes/isomorphic.hpp + + include/nil/crypto3/pubkey/bls.hpp + include/nil/crypto3/pubkey/ecdsa.hpp + include/nil/crypto3/pubkey/eddsa.hpp + + include/nil/crypto3/pubkey/type_traits.hpp) list(APPEND ${CURRENT_PROJECT_NAME}_PRIVATE_HEADERS - include/nil/crypto3/pubkey/operations/aggregate_op.hpp - include/nil/crypto3/pubkey/operations/aggregate_verify_op.hpp - include/nil/crypto3/pubkey/operations/aggregate_verify_single_msg_op.hpp - include/nil/crypto3/pubkey/operations/deal_share_op.hpp - include/nil/crypto3/pubkey/operations/deal_shares_op.hpp - include/nil/crypto3/pubkey/operations/reconstruct_public_secret_op.hpp - include/nil/crypto3/pubkey/operations/reconstruct_secret_op.hpp - include/nil/crypto3/pubkey/operations/verify_share_op.hpp) + include/nil/crypto3/pubkey/operations/aggregate_op.hpp + include/nil/crypto3/pubkey/operations/aggregate_verify_op.hpp + include/nil/crypto3/pubkey/operations/aggregate_verify_single_msg_op.hpp + include/nil/crypto3/pubkey/operations/deal_share_op.hpp + include/nil/crypto3/pubkey/operations/deal_shares_op.hpp + include/nil/crypto3/pubkey/operations/reconstruct_public_secret_op.hpp + include/nil/crypto3/pubkey/operations/reconstruct_secret_op.hpp + include/nil/crypto3/pubkey/operations/verify_share_op.hpp) list(APPEND ${CURRENT_PROJECT_NAME}_UNGROUPED_SOURCES) @@ -96,31 +93,31 @@ if(CRYPTO3_PUBKEY_EDDSA) endif() list(APPEND ${CURRENT_PROJECT_NAME}_HEADERS - ${${CURRENT_PROJECT_NAME}_PUBLIC_HEADERS}) + ${${CURRENT_PROJECT_NAME}_PUBLIC_HEADERS}) list(APPEND ${CURRENT_PROJECT_NAME}_SOURCES - ${${CURRENT_PROJECT_NAME}_UNGROUPED_SOURCES}) + ${${CURRENT_PROJECT_NAME}_UNGROUPED_SOURCES}) cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}) add_library(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE) set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES - EXPORT_NAME ${CURRENT_PROJECT_NAME}) + EXPORT_NAME ${CURRENT_PROJECT_NAME}) target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE - ${${CURRENT_PROJECT_NAME}_LIBRARIES} - ${Boost_LIBRARIES}) + ${${CURRENT_PROJECT_NAME}_LIBRARIES} + ${Boost_LIBRARIES}) target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE - $ - $ + $ + $ - $<$:${Boost_INCLUDE_DIRS}>) + $<$:${Boost_INCLUDE_DIRS}>) cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} - INCLUDE include - NAMESPACE ${CMAKE_WORKSPACE_NAME}::) + INCLUDE include + NAMESPACE ${CMAKE_WORKSPACE_NAME}::) if(BUILD_TESTS) add_subdirectory(test)