diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c9efd4..1b7dde7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,6 @@ link_directories("${CMAKE_INSTALL_PREFIX}/lib") # external libs include(cmake/embear_logger.cmake) include(cmake/keccak.cmake) -include(cmake/mbedtls.cmake) include(cmake/unity.cmake) include(cmake/uthash.cmake) @@ -157,16 +156,12 @@ add_dependencies(common ext_uthash ext_keccak ext_embear_logger - ext_mbedtls ) target_link_libraries(common PUBLIC Threads::Threads keccak - logger - mbedtls - mbedcrypto - mbedx509) + logger) # install install(TARGETS common DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") diff --git a/README.md b/README.md index 8e1c266..207b877 100644 --- a/README.md +++ b/README.md @@ -91,9 +91,6 @@ target_include_directories( target_link_libraries( logger keccak - mbedtls - mbedcrypto - mbedx509 ) ``` diff --git a/cmake/mbedtls.cmake b/cmake/mbedtls.cmake deleted file mode 100644 index 343db76..0000000 --- a/cmake/mbedtls.cmake +++ /dev/null @@ -1,58 +0,0 @@ -#[[ -Copyright (c) 2019 IOTA Stiftung -https://github.com/iotaledger/iota_common - -Refer to the LICENSE file for licensing information -]] - -if (NOT __MBEDTLS_INCLUDED) - set(__MBEDTLS_INCLUDED TRUE) - - ExternalProject_Add( - mbedtls_download - PREFIX ${PROJECT_BINARY_DIR}/mbedtls - SOURCE_DIR ${PROJECT_BINARY_DIR}/mbedtls/src/ext_mbedtls - DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/download - DOWNLOAD_NAME mbedtls_v2.17.0.tar.gz - URL https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.17.0.tar.gz - URL_HASH SHA256=321a2c0220d9f75703e929c01dabba7b77da4cf2e39944897fc41d888bb1ef0d - CONFIGURE_COMMAND "" - INSTALL_COMMAND "" - BUILD_COMMAND "" - # for debug - # LOG_DOWNLOAD 1 - ) - - ExternalProject_Add( - crypto_download - PREFIX ${PROJECT_BINARY_DIR}/mbedtls - SOURCE_DIR ${PROJECT_BINARY_DIR}/mbedtls/src/ext_mbedtls/crypto - DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/download - DOWNLOAD_NAME crypto_a78c958b17d75ddf.tar.gz - URL https://github.com/ARMmbed/mbed-crypto/archive/a78c958b17d75ddf63d8dd17255b6379dcbf259f.tar.gz - URL_HASH SHA256=96538dde4fc400290b80651038f79079e910d7d29aece203a6378f885129f8cf - CONFIGURE_COMMAND "" - INSTALL_COMMAND "" - BUILD_COMMAND "" - # for debug - # LOG_DOWNLOAD 1 - ) - - ExternalProject_Add( - ext_mbedtls - PREFIX ${PROJECT_BINARY_DIR}/mbedtls - DOWNLOAD_COMMAND "" - CMAKE_ARGS - -DENABLE_TESTING=Off - -DENABLE_PROGRAMS=Off - -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX} - # -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE} - # for debug - # LOG_CONFIGURE 1 - # LOG_INSTALL 1 - ) - - add_dependencies(crypto_download mbedtls_download ) - add_dependencies(ext_mbedtls crypto_download) - -endif() \ No newline at end of file