mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 01:29:08 +08:00
8b4ff54ecd
* Fix Aws Crypto Abstraction Layer and S2N builds * Fix aws-c-cal build * Revert changes * [s2n] update to 1.1.0 * Do not build tests for any of AWS SDK for C++ dependencies Remove unused flags from OpenSSL and AWS SDK for C++ builds * Update versions * Fix indentation * Fix indentation * Remove redundant flags * Remove redundant options * Update ports/aws-c-auth/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-cal/002-no-exe-no-tests.patch Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-cal/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-cal/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-compression/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-crt-cpp/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-checksums/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-event-stream/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-s3/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-http/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-io/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-mqtt/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Simplify patch Restore PREFER_NINJA for OpenSSL build * Update versions * Replace deprecated methods * Update versions * Fix dependencies of OpenSSL * Fix dependencies of OpenSSL * Update ports/aws-c-cal/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-io/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/aws-c-io/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Fix versions * Revert quotation mark change * Revert quotation mark change * Revert quotation mark change * Patch AWS CRT for C++ for iOS build Do not copy sha256_profile tool when building aws-c-cal * Remove redundant flags * Fix indentation * Update versions * Update versions * Fix aws-c-cal build Update versions * Update versions * Update versions * Update versions * Update versions * Update versions * Fix library paths for Windows shared builds * Revert compiler check * Update versions * Fix indentation Revert OS check * Update versions * Fix indentation * Fix indentation * Fix indentation * Update versions/o-/openssl.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions * Update versions * Update versions Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com> Co-authored-by: Charles-Auguste Marois <cmarois@coveo.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake
|
|
--- a/cmake/AWSSDKConfig.cmake (revision 2f90f9fd6c56460bd382243aa215fcddcb5883c8)
|
|
+++ b/cmake/AWSSDKConfig.cmake (date 1636913220527)
|
|
@@ -54,18 +54,14 @@
|
|
string(REPLACE ";" "${AWS_MODULE_DIR};" SYSTEM_MODULE_PATH "${CMAKE_SYSTEM_PREFIX_PATH}${AWS_MODULE_DIR}")
|
|
list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH} ${SYSTEM_MODULE_PATH})
|
|
|
|
-# On Windows, dlls are treated as runtime target and installed in bindir
|
|
if (WIN32 AND AWSSDK_INSTALL_AS_SHARED_LIBS)
|
|
- set(AWSSDK_INSTALL_LIBDIR "${AWSSDK_INSTALL_BINDIR}")
|
|
# If installed CMake scripts are associated with dll library, define USE_IMPORT_EXPORT for customers
|
|
add_definitions(-DUSE_IMPORT_EXPORT)
|
|
endif()
|
|
|
|
|
|
# Compute the default installation root relative to this file.
|
|
-# from prefix/lib/cmake/AWSSDK/xx.cmake to prefix
|
|
get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
|
-get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH)
|
|
get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH)
|
|
get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH)
|
|
get_filename_component(AWS_NATIVE_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
|