зеркало из https://github.com/microsoft/vcpkg.git
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 <ahmed.alnuaimi@zwift.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
This commit is contained in:
Родитель
e263d00933
Коммит
be2092af4e
|
@ -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
|
||||
|
|
|
@ -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()
|
|
@ -3658,7 +3658,7 @@
|
|||
},
|
||||
"mbedtls": {
|
||||
"baseline": "2.24.0",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"mcpp": {
|
||||
"baseline": "2.7.2.14",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "f1591b930b769b43c14a193282eb85e9a7c51a47",
|
||||
"version-string": "2.24.0",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "8b510a700284731a6f552ff2cd874794af4032ff",
|
||||
"version-string": "2.24.0",
|
||||
|
|
Загрузка…
Ссылка в новой задаче