Skip to content

Commit 1da246f

Browse files
authored
cmake .. will not activate ENABLE_AWS_S3 by default. (#922)
1 parent 5757d48 commit 1da246f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

contrib/aws-cmake/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set(ENABLE_AWS_S3_DEFAULT OFF)
22
set(ENABLE_AWS_MSK_IAM_DEFAULT OFF) # proton: added
33

44
if(ENABLE_LIBRARIES AND (OS_LINUX OR OS_DARWIN) AND TARGET OpenSSL::Crypto)
5-
set(ENABLE_AWS_S3_DEFAULT ON)
5+
set(ENABLE_AWS_S3_DEFAULT OFF) # proton: added https://github.com/timeplus-io/proton/issues/918
66
set(ENABLE_AWS_MSK_IAM_DEFAULT ON) # proton: added
77
endif()
88

@@ -17,6 +17,11 @@ if(ENABLE_AWS_S3 OR ENABLE_AWS_MSK_IAM) # proton: updated
1717
endif()
1818
endif()
1919

20+
if(NOT ENABLE_AWS_S3)
21+
message(STATUS "Not using AWS S3")
22+
return()
23+
endif()
24+
2025
if(NOT (ENABLE_AWS_S3 OR ENABLE_AWS_MSK_IAM)) # proton: updated
2126
message(STATUS "Not using AWS SDK") # proton: updated
2227
return()

src/configure_config.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ if (TARGET ch_contrib::datasketches)
6262
set(USE_DATASKETCHES 1)
6363
endif()
6464
if (TARGET ch_contrib::aws_s3)
65-
set(USE_AWS_S3 0)
65+
set(USE_AWS_S3 1)
6666
endif()
6767
# proton: starts
6868
if (TARGET ch_contrib::aws_msk_iam)

0 commit comments

Comments
 (0)