From be2092af4e6f7649dee37969104f93f68c3945fc Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 25 Jan 2021 04:37:22 -0300 Subject: Fix Mbed TLS build for Android (#15680) * Fix Mbed TLS build for Android * Fix Mbed TLS build for Android Add better Windows checks * Fix libssh build for Android * update baseline * Remove redundant parameter * Fix version * Fix version * Fix paramters * Fix version * Better Android support * Fix version * Disable warnings as errors for Mbed TLS * Restore formatting * Fix version files Co-authored-by: Ahmed Yarub Hani Al Nuaimi Co-authored-by: JackBoosY Co-authored-by: Nicole Mazzuca --- ports/mbedtls/CONTROL | 2 +- ports/mbedtls/portfile.cmake | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'ports') diff --git a/ports/mbedtls/CONTROL b/ports/mbedtls/CONTROL index 74164ea10..dc8bded7b 100644 --- a/ports/mbedtls/CONTROL +++ b/ports/mbedtls/CONTROL @@ -1,6 +1,6 @@ Source: mbedtls Version: 2.24.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/ARMmbed/mbedtls Description: An open source, portable, easy to use, readable and flexible SSL library Supports: !uwp diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 196f7c08b..3bd961fbc 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -25,6 +25,7 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF + -DMBEDTLS_FATAL_WARNINGS=FALSE ) vcpkg_install_cmake() @@ -33,8 +34,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -if(WIN32 AND pthreads IN_LIST FEATURES) +if (VCPKG_TARGET_IS_WINDOWS AND pthreads IN_LIST FEATURES) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -endif() +endif () vcpkg_copy_pdbs() \ No newline at end of file -- cgit v1.2.3