This is an automated email from the ASF dual-hosted git repository. szaszm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit e54e958b68c892e33a68a39a5d149426397764ad Author: Gabor Gyimesi <[email protected]> AuthorDate: Mon Apr 17 15:55:04 2023 +0200 MINIFICPP-2058 Fix AWS extension link error on ARM64 Closes #1554 Signed-off-by: Marton Szasz <[email protected]> --- extensions/aws/CMakeLists.txt | 3 +++ extensions/aws/tests/CMakeLists.txt | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/aws/CMakeLists.txt b/extensions/aws/CMakeLists.txt index f4adb626b..9dc3f01b0 100644 --- a/extensions/aws/CMakeLists.txt +++ b/extensions/aws/CMakeLists.txt @@ -34,6 +34,9 @@ add_library(minifi-aws SHARED ${SOURCES}) target_link_libraries(minifi-aws PUBLIC ${LIBMINIFI} Threads::Threads) target_wholearchive_library_private(minifi-aws AWS::aws-cpp-sdk-s3) +if(CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)|(ARM64)|(aarch64)|(armv8)") + target_wholearchive_library_private(minifi-aws AWS::aws-checksums) +endif() get_target_property(AWS_SDK_INCLUDE_DIRS AWS::aws-cpp-sdk-s3 INTERFACE_INCLUDE_DIRECTORIES) target_include_directories(minifi-aws INTERFACE ${AWS_SDK_INCLUDE_DIRS}) if(WIN32) diff --git a/extensions/aws/tests/CMakeLists.txt b/extensions/aws/tests/CMakeLists.txt index 732755fb9..261b7a694 100644 --- a/extensions/aws/tests/CMakeLists.txt +++ b/extensions/aws/tests/CMakeLists.txt @@ -18,7 +18,6 @@ # file(GLOB AWS_INTEGRATION_TESTS "*.cpp") -include(BundledAwsSdkCpp) SET(AWS_TEST_COUNT 0) FOREACH(testfile ${AWS_INTEGRATION_TESTS}) @@ -35,7 +34,6 @@ FOREACH(testfile ${AWS_INTEGRATION_TESTS}) target_link_libraries(${testfilename} minifi-aws) target_link_libraries(${testfilename} minifi-standard-processors) target_link_libraries(${testfilename} minifi-expression-language-extensions) - target_link_libraries(${testfilename} ${LIBAWS_LIBRARIES}) MATH(EXPR AWS_TEST_COUNT "${AWS_TEST_COUNT}+1") add_test(NAME "${testfilename}" COMMAND "${testfilename}" WORKING_DIRECTORY ${TEST_DIR}) ENDFOREACH()
