Commit 23101e6c authored by Jørgen Lind's avatar Jørgen Lind
Browse files

Merge branch feature/jorgen.lind/upgrade_aws with refs/heads/master into...

Merge branch feature/jorgen.lind/upgrade_aws with refs/heads/master into refs/merge-requests/429/train
parents 75aeb323 6a77c94e
Pipeline #47351 passed with stages
in 29 minutes and 8 seconds
......@@ -5,29 +5,29 @@ macro(BuildAWSSDK)
list(APPEND AWS_LIBS_LIST "bin/aws-cpp-sdk-sts.lib")
list(APPEND AWS_LIBS_LIST "bin/aws-cpp-sdk-transfer.lib")
list(APPEND AWS_DLLS_LIST "bin/aws-c-auth.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-c-cal.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-c-common.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-c-compression.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-c-event-stream.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-c-http.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-c-io.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-c-mqtt.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-c-s3.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-crt-cpp.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-checksums.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-cpp-sdk-core.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-cpp-sdk-s3.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-cpp-sdk-sts.dll")
list(APPEND AWS_DLLS_LIST "bin/aws-cpp-sdk-transfer.dll")
elseif (APPLE)
list(APPEND AWS_DLLS_LIST "lib/libaws-c-common.dylib")
list(APPEND AWS_DLLS_LIST "lib/libaws-c-event-stream.dylib")
list(APPEND AWS_DLLS_LIST "lib/libaws-checksums.dylib")
list(APPEND AWS_DLLS_LIST "lib/libaws-cpp-sdk-core.dylib")
list(APPEND AWS_DLLS_LIST "lib/libaws-cpp-sdk-s3.dylib")
list(APPEND AWS_DLLS_LIST "lib/libaws-cpp-sdk-sts.dylib")
list(APPEND AWS_DLLS_LIST "lib/libaws-cpp-sdk-transfer.dylib")
else()
list(APPEND AWS_DLLS_LIST "lib${LIBSUFFIX}/libaws-c-common.so")
list(APPEND AWS_DLLS_LIST "lib${LIBSUFFIX}/libaws-c-common.so.0unstable")
list(APPEND AWS_DLLS_LIST "lib${LIBSUFFIX}/libaws-c-common.so.1.0.0")
list(APPEND AWS_DLLS_LIST "lib${LIBSUFFIX}/libaws-c-event-stream.so")
list(APPEND AWS_DLLS_LIST "lib${LIBSUFFIX}/libaws-c-event-stream.so.0unstable")
list(APPEND AWS_DLLS_LIST "lib${LIBSUFFIX}/libaws-c-event-stream.so.1.0.0")
list(APPEND AWS_DLLS_LIST "lib${LIBSUFFIX}/libaws-checksums.so")
list(APPEND AWS_DLLS_LIST "lib${LIBSUFFIX}/libaws-cpp-sdk-core.so")
list(APPEND AWS_DLLS_LIST "lib${LIBSUFFIX}/libaws-cpp-sdk-s3.so")
list(APPEND AWS_DLLS_LIST "lib${LIBSUFFIX}/libaws-cpp-sdk-sts.so")
......
......@@ -88,7 +88,7 @@ function(Fetch3rdParty)
set(FETCHCONTENT_QUIET OFF)
include(FetchContent)
Fetch3rdParty_Package(aws-cpp-sdk 1.8.96 https://codeload.github.com/aws/aws-sdk-cpp/tar.gz/1.8.96 SHA256=b03abd6384c54562b6365bb8579f2d58ff11817ade28e1229d6969f48bbf92fe)
Fetch3rdParty_Git(aws-cpp-sdk 1.9.45 https://github.com/aws/aws-sdk-cpp.git 1.9.45)
Fetch3rdParty_Package(gtest 1.10.0 https://github.com/google/googletest/archive/release-1.10.0.tar.gz SHA256=9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb)
Fetch3rdParty_Package(jsoncpp 1.8.4 https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz MD5=fa47a3ab6b381869b6a5f20811198662)
Fetch3rdParty_Package(fmt 7.1.3 https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz SHA256=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment