From 647749cff28ce7c45027b56b875121230dbdd833 Mon Sep 17 00:00:00 2001 From: Greg Eisenhauer Date: Wed, 13 Sep 2023 12:35:52 -0400 Subject: [PATCH] Merge pull request #3804 from pnorbert/fix-aws-version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set AWS version requirement to 1.10.15 and also turn it OFF by defaul… (cherry picked from commit 88151f256ceb86f430a62e6220876c26616fdb8b) --- CMakeLists.txt | 2 +- cmake/DetectOptions.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cd1bb4c7e..ebb992c1f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,7 +170,7 @@ adios_option(Profiling "Enable support for profiling" AUTO) adios_option(Endian_Reverse "Enable support for Little/Big Endian Interoperability" AUTO) adios_option(Sodium "Enable support for Sodium for encryption" AUTO) adios_option(Catalyst "Enable support for in situ visualization plugin using ParaView Catalyst" AUTO) -adios_option(AWSSDK "Enable support for S3 compatible storage using AWS SDK's S3 module" AUTO) +adios_option(AWSSDK "Enable support for S3 compatible storage using AWS SDK's S3 module" OFF) include(${PROJECT_SOURCE_DIR}/cmake/DetectOptions.cmake) if(ADIOS2_HAVE_CUDA OR ADIOS2_HAVE_Kokkos_CUDA) diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake index ba47157116..5a7526478b 100644 --- a/cmake/DetectOptions.cmake +++ b/cmake/DetectOptions.cmake @@ -546,9 +546,9 @@ endif() # AWS S3 if(ADIOS2_USE_AWSSDK STREQUAL AUTO) - find_package(AWSSDK QUIET COMPONENTS s3) + find_package(AWSSDK 1.10.15 COMPONENTS s3) elseif(ADIOS2_USE_AWSSDK) - find_package(AWSSDK REQUIRED COMPONENTS s3) + find_package(AWSSDK 1.10.15 REQUIRED COMPONENTS s3) endif() if(AWSSDK_FOUND) set(ADIOS2_HAVE_AWSSDK TRUE)