mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 04:39:02 +08:00
fe25e8ede8
* Fix Android build * Add versioning support * Disable building tests for cURL * Fix patch file * Fix patch file * Fix patch file * Fix versioning * Fix patch file * [aws-sdk-cpp] Update patch * update baseline * Fix dependencies * Simplify Android configuration * Simplify Android configuration * Simplify Android configuration Add alternative Git CMake script * Bump port version * Bump version files * Remove redundant file * Bump port version * Fix version files * Do not build curl, zlib and OpenSSL * Typo de pkgconfig script * Fix cURL build for Android * Add required flags * Revert macro change * Fix curl build for other platforms * Fix curl build for other platforms * [vcpkg baseline][gsoap] Update to 2.8.111 * Update versions * [ktx/otl] Update download hash * update version record * Fix curl build for other platforms * Update ports/aws-sdk-cpp/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/aws-sdk-cpp/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Remove FingGit * Fix configuration step * Bump cURL port version * Bump cURL port version * Bump AWS SDK C++ version * Bump AWS SDK C++ version * Bump AWS SDK C++ version * Bump AWS SDK C++ version * Update ports/curl/CONTROL * Update ports/curl/portfile.cmake * update baseline record * Fix Git * update version record * Typo * Fix cross-platform builds of OpenSSL on MinGW/Windows * Update version * Fix version * update doc * Update ports/aws-sdk-cpp/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Update ports/aws-sdk-cpp/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Add debug libraries to curl for Android Simplify OpenSSL patch for curl Update OpenSSL's port version * Update aws-sdk-cpp, curl, and OpenSSL versions * Fix libssh after latest update * Update libssh version * Update libssh version * Update ports/libssh/portfile.cmake Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * Update ports/curl/portfile.cmake Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * Update ports/libssh/portfile.cmake * Apply suggestions from code review * Use correct variables for OpenSSL libraries when building curl for Android Fix zlib building for Android Remove redundant patch comments * Bump zlib's port version * Update zlib, libssh, and curl versions * [vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path * update version record * Update versions/o-/openssl.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> 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> Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
28 lines
974 B
Diff
28 lines
974 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt (revision e052859759b34d0e05ce0f17244873e5cd7b457b)
|
|
+++ b/CMakeLists.txt (date 1617452756163)
|
|
@@ -383,14 +383,21 @@
|
|
endif()
|
|
|
|
if(CMAKE_USE_OPENSSL)
|
|
- find_package(OpenSSL REQUIRED)
|
|
+ if(ANDROID)
|
|
+ message(WARNING "Setting paths manually (instead of using pkg-config) since this is an android build" )
|
|
+
|
|
+ set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARY} ${CRYPT_LIBRARY})
|
|
+ include_directories("${OPENSSL_INCLUDE}")
|
|
+ else()
|
|
+ find_package(OpenSSL REQUIRED)
|
|
+ endif()
|
|
set(SSL_ENABLED ON)
|
|
set(USE_OPENSSL ON)
|
|
|
|
# Depend on OpenSSL via imported targets if supported by the running
|
|
# version of CMake. This allows our dependents to get our dependencies
|
|
# transitively.
|
|
- if(NOT CMAKE_VERSION VERSION_LESS 3.4)
|
|
+ if(NOT CMAKE_VERSION VERSION_LESS 3.4 AND NOT ANDROID)
|
|
list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto)
|
|
else()
|
|
list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
|