diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f31c61758..3cab1a472c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -318,10 +318,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Coverage") endif(CMAKE_COMPILER_IS_GNU OR CMAKE_COMPILER_IS_CLANG) endif(CMAKE_BUILD_TYPE STREQUAL "Coverage") -if(LIB_INSTALL_DIR) - set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}") -endif() - if (NOT EXISTS "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt") message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found. Run `git submodule update --init` from the source tree to fetch the submodule contents.") endif() diff --git a/tf-psa-crypto/CMakeLists.txt b/tf-psa-crypto/CMakeLists.txt index 4827e0f61a..21eb64e6fd 100644 --- a/tf-psa-crypto/CMakeLists.txt +++ b/tf-psa-crypto/CMakeLists.txt @@ -33,10 +33,6 @@ cmake_policy(SET CMP0012 NEW) if(NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)) -if(LIB_INSTALL_DIR) - set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}") -endif() - set(TF_PSA_CRYPTO_PYTHON_EXECUTABLE ${MBEDTLS_PYTHON_EXECUTABLE}) set(USE_STATIC_TF_PSA_CRYPTO_LIBRARY ${USE_STATIC_MBEDTLS_LIBRARY}) set(USE_SHARED_TF_PSA_CRYPTO_LIBRARY ${USE_SHARED_MBEDTLS_LIBRARY}) diff --git a/tf-psa-crypto/TF-PSA-Crypto.cmake b/tf-psa-crypto/TF-PSA-Crypto.cmake index 8c8768433d..9f88ddba9a 100644 --- a/tf-psa-crypto/TF-PSA-Crypto.cmake +++ b/tf-psa-crypto/TF-PSA-Crypto.cmake @@ -274,10 +274,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Coverage") endif(CMAKE_COMPILER_IS_GNU OR CMAKE_COMPILER_IS_CLANG) endif(CMAKE_BUILD_TYPE STREQUAL "Coverage") -if(LIB_INSTALL_DIR) - set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}") -endif() - if (NOT EXISTS "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt") message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found. Run `git submodule update --init` from the source tree to fetch the submodule contents.") endif()