From 2cd40621a34bea09cf35e8b8b54ea5d56061a9b2 Mon Sep 17 00:00:00 2001 From: Damian Vicino Date: Thu, 9 Jun 2022 15:03:20 -0400 Subject: [PATCH 1/4] Improving main CMakeLists code organization --- CMakeLists.txt | 32 +++++++++++--------------------- dependencies/CMakeLists.txt | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 dependencies/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 294a5eff2d9..b3a9cc2a9a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ if (LEGACY_BUILD) project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX) include(legacy_main) else () + # -- Preamble -- message(STATUS "Building with new CMake scripts.") string(CONCAT DESCRIPTION_STRING "The AWS SDK for C++ provides a modern C++ (standard version C++11 or later) " "interface for Amazon Web Services (AWS).") @@ -34,7 +35,8 @@ else () DESCRIPTION ${DESCRIPTION_STRING} HOMEPAGE_URL "https://docs.aws.amazon.com/sdk-for-cpp" ) - + include(CTest) + # -- Project wide setup -- # Setting C++ minimum requirements set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_EXTENSIONS OFF) @@ -71,29 +73,17 @@ else () # Options definition option(BUILD_TESTING "If enabled, the SDK will include tests in the build" OFF) - message(STATUS "Setting toolchain and dependencies") - if (BUILD_TESTING) - message(STATUS "Building tests") - enable_testing() - # Testing dependency - find_package(GTest 1.11 REQUIRED) - include(GoogleTest) # for gtest_discover_tests() - endif () - - # Project dependencies http library (curl or OS), tinyxml2, cJSON, ssl (open or other), CRT - find_package(CURL REQUIRED) - find_package(ZLIB REQUIRED) - find_package(OpenSSL REQUIRED COMPONENTS Crypto) - pkg_check_modules(tinyxml2 REQUIRED IMPORTED_TARGET tinyxml2>=9.0.0) - pkg_check_modules(CJSON REQUIRED IMPORTED_TARGET libcjson>=1.7.15) - find_package(aws-crt-cpp 0.17.9 EXACT REQUIRED COMPONENTS io) + # -- Dependencies -- + add_subdirectory(dependencies) - message(STATUS "Preparing core library build") + # -- main build targets -- add_subdirectory(src) - message(STATUS "Preparing CPack metadata") - add_subdirectory(packaging) - + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + # -- Test -- + # -- Packaging -- + add_subdirectory(packaging) + endif () message(WARNING "The dependencies are currently checked only for a basic Linux build, new ones need to be added for other platforms yet") message(WARNING "Anything below this warning is a TODO not yet implemented.") diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt new file mode 100644 index 00000000000..df803dbc651 --- /dev/null +++ b/dependencies/CMakeLists.txt @@ -0,0 +1,15 @@ +# Testing Dependencies +if (BUILD_TESTING) + message(STATUS "Building tests") + # Testing dependency + find_package(GTest 1.11 REQUIRED) + include(GoogleTest) # for gtest_discover_tests() +endif () + +# Project dependencies http library (curl or OS), tinyxml2, cJSON, ssl (open or other), CRT +find_package(CURL REQUIRED) +find_package(ZLIB REQUIRED) +find_package(OpenSSL REQUIRED COMPONENTS Crypto) +pkg_check_modules(tinyxml2 REQUIRED IMPORTED_TARGET tinyxml2>=9.0.0) +pkg_check_modules(CJSON REQUIRED IMPORTED_TARGET libcjson>=1.7.15) +find_package(aws-crt-cpp 0.17.9 EXACT REQUIRED COMPONENTS io) \ No newline at end of file From 293898dca161feec142b0f030475bd316695cb95 Mon Sep 17 00:00:00 2001 From: Damian Vicino Date: Thu, 9 Jun 2022 15:22:13 -0400 Subject: [PATCH 2/4] Removing dependencies from gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index eea6b1f2d20..c3518a83849 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,6 @@ doxygen/latex/ #cmake artifacts -dependencies _build build _build_* From a451bff0349746a6846e2997b8fc67bf6120061e Mon Sep 17 00:00:00 2001 From: Damian Vicino Date: Mon, 13 Jun 2022 12:28:46 -0400 Subject: [PATCH 3/4] Moving from test to tests for integration tests location --- cmake_legacy/sdks.cmake | 4 ++-- {test => tests}/AndroidSDKTesting/.gitignore | 0 {test => tests}/AndroidSDKTesting/app/.gitignore | 0 {test => tests}/AndroidSDKTesting/app/build.gradle | 0 .../AndroidSDKTesting/app/proguard-rules.pro | 0 .../androidsdktesting/ExampleInstrumentedTest.java | 0 .../app/src/main/AndroidManifest.xml | 0 .../java/aws/androidsdktesting/RunSDKTests.java | 0 .../src/main/res/layout/activity_run_sdktests.xml | 0 .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values-w820dp/dimens.xml | 0 .../app/src/main/res/values/colors.xml | 0 .../app/src/main/res/values/dimens.xml | 0 .../app/src/main/res/values/strings.xml | 0 .../app/src/main/res/values/styles.xml | 0 .../java/aws/androidsdktesting/ExampleUnitTest.java | 0 {test => tests}/AndroidSDKTesting/build.gradle | 0 {test => tests}/AndroidSDKTesting/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {test => tests}/AndroidSDKTesting/gradlew | 0 {test => tests}/AndroidSDKTesting/gradlew.bat | 0 {test => tests}/AndroidSDKTesting/settings.gradle | 0 tests/CMakeLists.txt | 0 .../android-unified-tests/CMakeLists.txt | 0 {test => tests}/android-unified-tests/RunTests.cpp | 0 .../CMakeLists.txt | 0 .../CloudfrontOperationTest.cpp | 0 .../RunTests.cpp | 0 .../CMakeLists.txt | 0 .../IdentityPoolOperationTest.cpp | 0 .../RunTests.cpp | 0 .../CMakeLists.txt | 0 .../CustomServicePetStoreTest.cpp | 0 .../RunTests.cpp | 0 .../CMakeLists.txt | 0 .../RunTests.cpp | 0 .../TableOperationTest.cpp | 0 .../CMakeLists.txt | 0 .../aws-cpp-sdk-ec2-integration-tests/EC2Tests.cpp | 0 .../EC2TestsDualStack.cpp | 0 .../aws-cpp-sdk-ec2-integration-tests/RunTests.cpp | 0 .../CMakeLists.txt | 0 .../ElasticFileSystemTest.cpp | 0 .../RunTests.cpp | 0 .../CMakeLists.txt | 0 .../RunTests.cpp | 0 .../auth/CognitoCachingCredentialsProviderTest.cpp | 0 ...tentCognitoIdentityProvider_JsonFileImplTest.cpp | 0 .../auth/STSAssumeRoleCredentialsProviderTest.cpp | 0 .../auth/STSProfileCredentialsProviderTest.cpp | 0 .../CMakeLists.txt | 0 .../KinesisTests.cpp | 0 .../RunTests.cpp | 0 .../CMakeLists.txt | 0 .../FunctionTest.cpp | 0 .../RunTests.cpp | 0 .../resources/handled.zip | Bin .../resources/succeed.zip | Bin .../resources/unhandled.zip | Bin .../CMakeLists.txt | 0 .../CloudWatchLogsTests.cpp | 0 .../aws-cpp-sdk-logs-integration-tests/RunTests.cpp | 0 .../CMakeLists.txt | 0 .../MediaStoreDataTest.cpp | 0 .../RunTests.cpp | 0 .../aws-cpp-sdk-polly-sample/CMakeLists.txt | 0 {test => tests}/aws-cpp-sdk-polly-sample/main.cpp | 0 .../CMakeLists.txt | 0 .../aws-cpp-sdk-rds-integration-tests/RDSTest.cpp | 0 .../aws-cpp-sdk-rds-integration-tests/RunTests.cpp | 0 .../CMakeLists.txt | 0 .../RedshiftClientTest.cpp | 0 .../RunTests.cpp | 0 .../BucketAndObjectOperationTest.cpp | 0 .../CMakeLists.txt | 0 .../RunTests.cpp | 0 .../CMakeLists.txt | 0 .../LiveClientTests.cpp | 0 .../RunTests.cpp | 0 .../aws-cpp-sdk-s3-encryption-tests/CMakeLists.txt | 0 .../CryptoModulesTest.cpp | 0 .../DataHandlersTest.cpp | 0 .../EncryptionMaterialsTest.cpp | 0 .../aws-cpp-sdk-s3-encryption-tests/RunTests.cpp | 0 .../BucketAndObjectOperationTest.cpp | 0 .../aws-cpp-sdk-s3-integration-tests/CMakeLists.txt | 0 .../aws-cpp-sdk-s3-integration-tests/RunTests.cpp | 0 .../CMakeLists.txt | 0 .../RunTests.cpp | 0 .../S3ControlTest.cpp | 0 .../CMakeLists.txt | 0 .../QueueOperationTest.cpp | 0 .../aws-cpp-sdk-sqs-integration-tests/RunTests.cpp | 0 .../aws-cpp-sdk-text-to-speech-tests/CMakeLists.txt | 0 .../aws-cpp-sdk-text-to-speech-tests/RunTests.cpp | 0 .../TextToSpeechManagerTests.cpp | 0 .../CMakeLists.txt | 0 .../RunTests.cpp | 0 .../TranscribeTests.cpp | 0 .../aws-cpp-sdk-transfer-tests/CMakeLists.txt | 0 .../aws-cpp-sdk-transfer-tests/RunTests.cpp | 0 .../aws-cpp-sdk-transfer-tests/TransferTests.cpp | 0 {test => tests}/testing-resources/.gitignore | 0 {test => tests}/testing-resources/CMakeLists.txt | 0 .../testing-resources/include/aws/external/gtest.h | 0 .../include/aws/testing/MemoryTesting.h | 0 .../include/aws/testing/ProxyConfig.h | 0 .../include/aws/testing/TestingEnvironment.h | 0 .../include/aws/testing/Testing_EXPORTS.h | 0 .../mocks/aws/auth/MockAWSHttpResourceClient.h | 0 .../aws/testing/mocks/aws/client/MockAWSClient.h | 0 .../testing/mocks/event/MockEventStreamDecoder.h | 0 .../testing/mocks/event/MockEventStreamHandler.h | 0 .../include/aws/testing/mocks/http/MockHttpClient.h | 0 .../testing/mocks/monitoring/TestingMonitoring.h | 0 .../include/aws/testing/platform/PlatformTesting.h | 0 .../aws/testing/platform/android/AndroidTesting.h | 0 .../testing-resources/source/MemoryTesting.cpp | 0 .../testing-resources/source/TestingEnvironment.cpp | 0 .../testing-resources/source/external/gtest-all.cc | 0 .../source/platform/android/AndroidTesting.cpp | 0 .../source/platform/android/PlatformTesting.cpp | 0 .../platform/linux-shared/PlatformTesting.cpp | 0 .../source/platform/windows/PlatformTesting.cpp | 0 129 files changed, 2 insertions(+), 2 deletions(-) rename {test => tests}/AndroidSDKTesting/.gitignore (100%) rename {test => tests}/AndroidSDKTesting/app/.gitignore (100%) rename {test => tests}/AndroidSDKTesting/app/build.gradle (100%) rename {test => tests}/AndroidSDKTesting/app/proguard-rules.pro (100%) rename {test => tests}/AndroidSDKTesting/app/src/androidTest/java/aws/androidsdktesting/ExampleInstrumentedTest.java (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/AndroidManifest.xml (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/java/aws/androidsdktesting/RunSDKTests.java (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/layout/activity_run_sdktests.xml (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/values-w820dp/dimens.xml (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/values/colors.xml (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/values/dimens.xml (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/values/strings.xml (100%) rename {test => tests}/AndroidSDKTesting/app/src/main/res/values/styles.xml (100%) rename {test => tests}/AndroidSDKTesting/app/src/test/java/aws/androidsdktesting/ExampleUnitTest.java (100%) rename {test => tests}/AndroidSDKTesting/build.gradle (100%) rename {test => tests}/AndroidSDKTesting/gradle.properties (100%) rename {test => tests}/AndroidSDKTesting/gradle/wrapper/gradle-wrapper.jar (100%) rename {test => tests}/AndroidSDKTesting/gradle/wrapper/gradle-wrapper.properties (100%) rename {test => tests}/AndroidSDKTesting/gradlew (100%) rename {test => tests}/AndroidSDKTesting/gradlew.bat (100%) rename {test => tests}/AndroidSDKTesting/settings.gradle (100%) create mode 100644 tests/CMakeLists.txt rename {test => tests}/android-unified-tests/CMakeLists.txt (100%) rename {test => tests}/android-unified-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-cloudfront-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-cloudfront-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-cognitoidentity-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-cognitoidentity-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-custom-service-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-custom-service-integration-tests/CustomServicePetStoreTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-custom-service-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-dynamodb-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-dynamodb-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-ec2-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-ec2-integration-tests/EC2Tests.cpp (100%) rename {test => tests}/aws-cpp-sdk-ec2-integration-tests/EC2TestsDualStack.cpp (100%) rename {test => tests}/aws-cpp-sdk-ec2-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-elasticfilesystem-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-elasticfilesystem-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-identity-management-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-identity-management-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-identity-management-tests/auth/CognitoCachingCredentialsProviderTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-identity-management-tests/auth/STSAssumeRoleCredentialsProviderTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-identity-management-tests/auth/STSProfileCredentialsProviderTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-kinesis-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-kinesis-integration-tests/KinesisTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-kinesis-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-lambda-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-lambda-integration-tests/resources/handled.zip (100%) rename {test => tests}/aws-cpp-sdk-lambda-integration-tests/resources/succeed.zip (100%) rename {test => tests}/aws-cpp-sdk-lambda-integration-tests/resources/unhandled.zip (100%) rename {test => tests}/aws-cpp-sdk-logs-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-logs-integration-tests/CloudWatchLogsTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-logs-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-mediastore-data-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-mediastore-data-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-polly-sample/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-polly-sample/main.cpp (100%) rename {test => tests}/aws-cpp-sdk-rds-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-rds-integration-tests/RDSTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-rds-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-redshift-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-redshift-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3-crt-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-s3-crt-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3-encryption-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-s3-encryption-integration-tests/LiveClientTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3-encryption-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3-encryption-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-s3-encryption-tests/CryptoModulesTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3-encryption-tests/DataHandlersTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3-encryption-tests/EncryptionMaterialsTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3-encryption-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-s3-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3control-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-s3control-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-sqs-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp (100%) rename {test => tests}/aws-cpp-sdk-sqs-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-text-to-speech-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-text-to-speech-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-text-to-speech-tests/TextToSpeechManagerTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-transcribestreaming-integration-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-transcribestreaming-integration-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-transcribestreaming-integration-tests/TranscribeTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-transfer-tests/CMakeLists.txt (100%) rename {test => tests}/aws-cpp-sdk-transfer-tests/RunTests.cpp (100%) rename {test => tests}/aws-cpp-sdk-transfer-tests/TransferTests.cpp (100%) rename {test => tests}/testing-resources/.gitignore (100%) rename {test => tests}/testing-resources/CMakeLists.txt (100%) rename {test => tests}/testing-resources/include/aws/external/gtest.h (100%) rename {test => tests}/testing-resources/include/aws/testing/MemoryTesting.h (100%) rename {test => tests}/testing-resources/include/aws/testing/ProxyConfig.h (100%) rename {test => tests}/testing-resources/include/aws/testing/TestingEnvironment.h (100%) rename {test => tests}/testing-resources/include/aws/testing/Testing_EXPORTS.h (100%) rename {test => tests}/testing-resources/include/aws/testing/mocks/aws/auth/MockAWSHttpResourceClient.h (100%) rename {test => tests}/testing-resources/include/aws/testing/mocks/aws/client/MockAWSClient.h (100%) rename {test => tests}/testing-resources/include/aws/testing/mocks/event/MockEventStreamDecoder.h (100%) rename {test => tests}/testing-resources/include/aws/testing/mocks/event/MockEventStreamHandler.h (100%) rename {test => tests}/testing-resources/include/aws/testing/mocks/http/MockHttpClient.h (100%) rename {test => tests}/testing-resources/include/aws/testing/mocks/monitoring/TestingMonitoring.h (100%) rename {test => tests}/testing-resources/include/aws/testing/platform/PlatformTesting.h (100%) rename {test => tests}/testing-resources/include/aws/testing/platform/android/AndroidTesting.h (100%) rename {test => tests}/testing-resources/source/MemoryTesting.cpp (100%) rename {test => tests}/testing-resources/source/TestingEnvironment.cpp (100%) rename {test => tests}/testing-resources/source/external/gtest-all.cc (100%) rename {test => tests}/testing-resources/source/platform/android/AndroidTesting.cpp (100%) rename {test => tests}/testing-resources/source/platform/android/PlatformTesting.cpp (100%) rename {test => tests}/testing-resources/source/platform/linux-shared/PlatformTesting.cpp (100%) rename {test => tests}/testing-resources/source/platform/windows/PlatformTesting.cpp (100%) diff --git a/cmake_legacy/sdks.cmake b/cmake_legacy/sdks.cmake index dcf7748e455..92d502ff4b4 100644 --- a/cmake_legacy/sdks.cmake +++ b/cmake_legacy/sdks.cmake @@ -218,7 +218,7 @@ function(add_sdks) #testing if(ENABLE_TESTING) - add_subdirectory(test/testing-resources) + add_subdirectory(tests/testing-resources) if(ENABLE_FUNCTIONAL_TESTING) message(STATUS "Clearing existing directory for document-test to prepare for generation.") @@ -274,7 +274,7 @@ function(add_sdks) if (TEST_PROJECT STREQUAL "aws-cpp-sdk-core-tests") add_subdirectory(src/${TEST_PROJECT}) else() - add_subdirectory(test/${TEST_PROJECT}) + add_subdirectory(tests/${TEST_PROJECT}) endif() endif() endif() diff --git a/test/AndroidSDKTesting/.gitignore b/tests/AndroidSDKTesting/.gitignore similarity index 100% rename from test/AndroidSDKTesting/.gitignore rename to tests/AndroidSDKTesting/.gitignore diff --git a/test/AndroidSDKTesting/app/.gitignore b/tests/AndroidSDKTesting/app/.gitignore similarity index 100% rename from test/AndroidSDKTesting/app/.gitignore rename to tests/AndroidSDKTesting/app/.gitignore diff --git a/test/AndroidSDKTesting/app/build.gradle b/tests/AndroidSDKTesting/app/build.gradle similarity index 100% rename from test/AndroidSDKTesting/app/build.gradle rename to tests/AndroidSDKTesting/app/build.gradle diff --git a/test/AndroidSDKTesting/app/proguard-rules.pro b/tests/AndroidSDKTesting/app/proguard-rules.pro similarity index 100% rename from test/AndroidSDKTesting/app/proguard-rules.pro rename to tests/AndroidSDKTesting/app/proguard-rules.pro diff --git a/test/AndroidSDKTesting/app/src/androidTest/java/aws/androidsdktesting/ExampleInstrumentedTest.java b/tests/AndroidSDKTesting/app/src/androidTest/java/aws/androidsdktesting/ExampleInstrumentedTest.java similarity index 100% rename from test/AndroidSDKTesting/app/src/androidTest/java/aws/androidsdktesting/ExampleInstrumentedTest.java rename to tests/AndroidSDKTesting/app/src/androidTest/java/aws/androidsdktesting/ExampleInstrumentedTest.java diff --git a/test/AndroidSDKTesting/app/src/main/AndroidManifest.xml b/tests/AndroidSDKTesting/app/src/main/AndroidManifest.xml similarity index 100% rename from test/AndroidSDKTesting/app/src/main/AndroidManifest.xml rename to tests/AndroidSDKTesting/app/src/main/AndroidManifest.xml diff --git a/test/AndroidSDKTesting/app/src/main/java/aws/androidsdktesting/RunSDKTests.java b/tests/AndroidSDKTesting/app/src/main/java/aws/androidsdktesting/RunSDKTests.java similarity index 100% rename from test/AndroidSDKTesting/app/src/main/java/aws/androidsdktesting/RunSDKTests.java rename to tests/AndroidSDKTesting/app/src/main/java/aws/androidsdktesting/RunSDKTests.java diff --git a/test/AndroidSDKTesting/app/src/main/res/layout/activity_run_sdktests.xml b/tests/AndroidSDKTesting/app/src/main/res/layout/activity_run_sdktests.xml similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/layout/activity_run_sdktests.xml rename to tests/AndroidSDKTesting/app/src/main/res/layout/activity_run_sdktests.xml diff --git a/test/AndroidSDKTesting/app/src/main/res/mipmap-hdpi/ic_launcher.png b/tests/AndroidSDKTesting/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to tests/AndroidSDKTesting/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/test/AndroidSDKTesting/app/src/main/res/mipmap-mdpi/ic_launcher.png b/tests/AndroidSDKTesting/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to tests/AndroidSDKTesting/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/test/AndroidSDKTesting/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/tests/AndroidSDKTesting/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to tests/AndroidSDKTesting/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/test/AndroidSDKTesting/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/tests/AndroidSDKTesting/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to tests/AndroidSDKTesting/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/test/AndroidSDKTesting/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/tests/AndroidSDKTesting/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to tests/AndroidSDKTesting/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/test/AndroidSDKTesting/app/src/main/res/values-w820dp/dimens.xml b/tests/AndroidSDKTesting/app/src/main/res/values-w820dp/dimens.xml similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/values-w820dp/dimens.xml rename to tests/AndroidSDKTesting/app/src/main/res/values-w820dp/dimens.xml diff --git a/test/AndroidSDKTesting/app/src/main/res/values/colors.xml b/tests/AndroidSDKTesting/app/src/main/res/values/colors.xml similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/values/colors.xml rename to tests/AndroidSDKTesting/app/src/main/res/values/colors.xml diff --git a/test/AndroidSDKTesting/app/src/main/res/values/dimens.xml b/tests/AndroidSDKTesting/app/src/main/res/values/dimens.xml similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/values/dimens.xml rename to tests/AndroidSDKTesting/app/src/main/res/values/dimens.xml diff --git a/test/AndroidSDKTesting/app/src/main/res/values/strings.xml b/tests/AndroidSDKTesting/app/src/main/res/values/strings.xml similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/values/strings.xml rename to tests/AndroidSDKTesting/app/src/main/res/values/strings.xml diff --git a/test/AndroidSDKTesting/app/src/main/res/values/styles.xml b/tests/AndroidSDKTesting/app/src/main/res/values/styles.xml similarity index 100% rename from test/AndroidSDKTesting/app/src/main/res/values/styles.xml rename to tests/AndroidSDKTesting/app/src/main/res/values/styles.xml diff --git a/test/AndroidSDKTesting/app/src/test/java/aws/androidsdktesting/ExampleUnitTest.java b/tests/AndroidSDKTesting/app/src/test/java/aws/androidsdktesting/ExampleUnitTest.java similarity index 100% rename from test/AndroidSDKTesting/app/src/test/java/aws/androidsdktesting/ExampleUnitTest.java rename to tests/AndroidSDKTesting/app/src/test/java/aws/androidsdktesting/ExampleUnitTest.java diff --git a/test/AndroidSDKTesting/build.gradle b/tests/AndroidSDKTesting/build.gradle similarity index 100% rename from test/AndroidSDKTesting/build.gradle rename to tests/AndroidSDKTesting/build.gradle diff --git a/test/AndroidSDKTesting/gradle.properties b/tests/AndroidSDKTesting/gradle.properties similarity index 100% rename from test/AndroidSDKTesting/gradle.properties rename to tests/AndroidSDKTesting/gradle.properties diff --git a/test/AndroidSDKTesting/gradle/wrapper/gradle-wrapper.jar b/tests/AndroidSDKTesting/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from test/AndroidSDKTesting/gradle/wrapper/gradle-wrapper.jar rename to tests/AndroidSDKTesting/gradle/wrapper/gradle-wrapper.jar diff --git a/test/AndroidSDKTesting/gradle/wrapper/gradle-wrapper.properties b/tests/AndroidSDKTesting/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from test/AndroidSDKTesting/gradle/wrapper/gradle-wrapper.properties rename to tests/AndroidSDKTesting/gradle/wrapper/gradle-wrapper.properties diff --git a/test/AndroidSDKTesting/gradlew b/tests/AndroidSDKTesting/gradlew similarity index 100% rename from test/AndroidSDKTesting/gradlew rename to tests/AndroidSDKTesting/gradlew diff --git a/test/AndroidSDKTesting/gradlew.bat b/tests/AndroidSDKTesting/gradlew.bat similarity index 100% rename from test/AndroidSDKTesting/gradlew.bat rename to tests/AndroidSDKTesting/gradlew.bat diff --git a/test/AndroidSDKTesting/settings.gradle b/tests/AndroidSDKTesting/settings.gradle similarity index 100% rename from test/AndroidSDKTesting/settings.gradle rename to tests/AndroidSDKTesting/settings.gradle diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/test/android-unified-tests/CMakeLists.txt b/tests/android-unified-tests/CMakeLists.txt similarity index 100% rename from test/android-unified-tests/CMakeLists.txt rename to tests/android-unified-tests/CMakeLists.txt diff --git a/test/android-unified-tests/RunTests.cpp b/tests/android-unified-tests/RunTests.cpp similarity index 100% rename from test/android-unified-tests/RunTests.cpp rename to tests/android-unified-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-cloudfront-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-cloudfront-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-cloudfront-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-cloudfront-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp b/tests/aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp similarity index 100% rename from test/aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp rename to tests/aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp diff --git a/test/aws-cpp-sdk-cloudfront-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-cloudfront-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-cloudfront-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-cloudfront-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-cognitoidentity-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-cognitoidentity-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-cognitoidentity-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-cognitoidentity-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp b/tests/aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp similarity index 100% rename from test/aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp rename to tests/aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp diff --git a/test/aws-cpp-sdk-cognitoidentity-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-cognitoidentity-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-cognitoidentity-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-cognitoidentity-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-custom-service-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-custom-service-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-custom-service-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-custom-service-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-custom-service-integration-tests/CustomServicePetStoreTest.cpp b/tests/aws-cpp-sdk-custom-service-integration-tests/CustomServicePetStoreTest.cpp similarity index 100% rename from test/aws-cpp-sdk-custom-service-integration-tests/CustomServicePetStoreTest.cpp rename to tests/aws-cpp-sdk-custom-service-integration-tests/CustomServicePetStoreTest.cpp diff --git a/test/aws-cpp-sdk-custom-service-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-custom-service-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-custom-service-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-custom-service-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-dynamodb-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-dynamodb-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-dynamodb-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-dynamodb-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-dynamodb-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-dynamodb-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-dynamodb-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-dynamodb-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp b/tests/aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp similarity index 100% rename from test/aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp rename to tests/aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp diff --git a/test/aws-cpp-sdk-ec2-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-ec2-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-ec2-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-ec2-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-ec2-integration-tests/EC2Tests.cpp b/tests/aws-cpp-sdk-ec2-integration-tests/EC2Tests.cpp similarity index 100% rename from test/aws-cpp-sdk-ec2-integration-tests/EC2Tests.cpp rename to tests/aws-cpp-sdk-ec2-integration-tests/EC2Tests.cpp diff --git a/test/aws-cpp-sdk-ec2-integration-tests/EC2TestsDualStack.cpp b/tests/aws-cpp-sdk-ec2-integration-tests/EC2TestsDualStack.cpp similarity index 100% rename from test/aws-cpp-sdk-ec2-integration-tests/EC2TestsDualStack.cpp rename to tests/aws-cpp-sdk-ec2-integration-tests/EC2TestsDualStack.cpp diff --git a/test/aws-cpp-sdk-ec2-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-ec2-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-ec2-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-ec2-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-elasticfilesystem-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-elasticfilesystem-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-elasticfilesystem-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-elasticfilesystem-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp b/tests/aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp similarity index 100% rename from test/aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp rename to tests/aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp diff --git a/test/aws-cpp-sdk-elasticfilesystem-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-elasticfilesystem-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-elasticfilesystem-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-elasticfilesystem-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-identity-management-tests/CMakeLists.txt b/tests/aws-cpp-sdk-identity-management-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-identity-management-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-identity-management-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-identity-management-tests/RunTests.cpp b/tests/aws-cpp-sdk-identity-management-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-identity-management-tests/RunTests.cpp rename to tests/aws-cpp-sdk-identity-management-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-identity-management-tests/auth/CognitoCachingCredentialsProviderTest.cpp b/tests/aws-cpp-sdk-identity-management-tests/auth/CognitoCachingCredentialsProviderTest.cpp similarity index 100% rename from test/aws-cpp-sdk-identity-management-tests/auth/CognitoCachingCredentialsProviderTest.cpp rename to tests/aws-cpp-sdk-identity-management-tests/auth/CognitoCachingCredentialsProviderTest.cpp diff --git a/test/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp b/tests/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp similarity index 100% rename from test/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp rename to tests/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp diff --git a/test/aws-cpp-sdk-identity-management-tests/auth/STSAssumeRoleCredentialsProviderTest.cpp b/tests/aws-cpp-sdk-identity-management-tests/auth/STSAssumeRoleCredentialsProviderTest.cpp similarity index 100% rename from test/aws-cpp-sdk-identity-management-tests/auth/STSAssumeRoleCredentialsProviderTest.cpp rename to tests/aws-cpp-sdk-identity-management-tests/auth/STSAssumeRoleCredentialsProviderTest.cpp diff --git a/test/aws-cpp-sdk-identity-management-tests/auth/STSProfileCredentialsProviderTest.cpp b/tests/aws-cpp-sdk-identity-management-tests/auth/STSProfileCredentialsProviderTest.cpp similarity index 100% rename from test/aws-cpp-sdk-identity-management-tests/auth/STSProfileCredentialsProviderTest.cpp rename to tests/aws-cpp-sdk-identity-management-tests/auth/STSProfileCredentialsProviderTest.cpp diff --git a/test/aws-cpp-sdk-kinesis-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-kinesis-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-kinesis-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-kinesis-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-kinesis-integration-tests/KinesisTests.cpp b/tests/aws-cpp-sdk-kinesis-integration-tests/KinesisTests.cpp similarity index 100% rename from test/aws-cpp-sdk-kinesis-integration-tests/KinesisTests.cpp rename to tests/aws-cpp-sdk-kinesis-integration-tests/KinesisTests.cpp diff --git a/test/aws-cpp-sdk-kinesis-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-kinesis-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-kinesis-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-kinesis-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp b/tests/aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp similarity index 100% rename from test/aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp rename to tests/aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp diff --git a/test/aws-cpp-sdk-lambda-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-lambda-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-lambda-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-lambda-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-lambda-integration-tests/resources/handled.zip b/tests/aws-cpp-sdk-lambda-integration-tests/resources/handled.zip similarity index 100% rename from test/aws-cpp-sdk-lambda-integration-tests/resources/handled.zip rename to tests/aws-cpp-sdk-lambda-integration-tests/resources/handled.zip diff --git a/test/aws-cpp-sdk-lambda-integration-tests/resources/succeed.zip b/tests/aws-cpp-sdk-lambda-integration-tests/resources/succeed.zip similarity index 100% rename from test/aws-cpp-sdk-lambda-integration-tests/resources/succeed.zip rename to tests/aws-cpp-sdk-lambda-integration-tests/resources/succeed.zip diff --git a/test/aws-cpp-sdk-lambda-integration-tests/resources/unhandled.zip b/tests/aws-cpp-sdk-lambda-integration-tests/resources/unhandled.zip similarity index 100% rename from test/aws-cpp-sdk-lambda-integration-tests/resources/unhandled.zip rename to tests/aws-cpp-sdk-lambda-integration-tests/resources/unhandled.zip diff --git a/test/aws-cpp-sdk-logs-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-logs-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-logs-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-logs-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-logs-integration-tests/CloudWatchLogsTests.cpp b/tests/aws-cpp-sdk-logs-integration-tests/CloudWatchLogsTests.cpp similarity index 100% rename from test/aws-cpp-sdk-logs-integration-tests/CloudWatchLogsTests.cpp rename to tests/aws-cpp-sdk-logs-integration-tests/CloudWatchLogsTests.cpp diff --git a/test/aws-cpp-sdk-logs-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-logs-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-logs-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-logs-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-mediastore-data-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-mediastore-data-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-mediastore-data-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-mediastore-data-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp b/tests/aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp similarity index 100% rename from test/aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp rename to tests/aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp diff --git a/test/aws-cpp-sdk-mediastore-data-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-mediastore-data-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-mediastore-data-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-mediastore-data-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-polly-sample/CMakeLists.txt b/tests/aws-cpp-sdk-polly-sample/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-polly-sample/CMakeLists.txt rename to tests/aws-cpp-sdk-polly-sample/CMakeLists.txt diff --git a/test/aws-cpp-sdk-polly-sample/main.cpp b/tests/aws-cpp-sdk-polly-sample/main.cpp similarity index 100% rename from test/aws-cpp-sdk-polly-sample/main.cpp rename to tests/aws-cpp-sdk-polly-sample/main.cpp diff --git a/test/aws-cpp-sdk-rds-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-rds-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-rds-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-rds-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-rds-integration-tests/RDSTest.cpp b/tests/aws-cpp-sdk-rds-integration-tests/RDSTest.cpp similarity index 100% rename from test/aws-cpp-sdk-rds-integration-tests/RDSTest.cpp rename to tests/aws-cpp-sdk-rds-integration-tests/RDSTest.cpp diff --git a/test/aws-cpp-sdk-rds-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-rds-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-rds-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-rds-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-redshift-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-redshift-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-redshift-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-redshift-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp b/tests/aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp similarity index 100% rename from test/aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp rename to tests/aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp diff --git a/test/aws-cpp-sdk-redshift-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-redshift-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-redshift-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-redshift-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp b/tests/aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp similarity index 100% rename from test/aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp rename to tests/aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp diff --git a/test/aws-cpp-sdk-s3-crt-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-s3-crt-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-s3-crt-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-s3-crt-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-s3-crt-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-s3-crt-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-s3-crt-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-s3-crt-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-s3-encryption-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-s3-encryption-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-s3-encryption-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-s3-encryption-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-s3-encryption-integration-tests/LiveClientTests.cpp b/tests/aws-cpp-sdk-s3-encryption-integration-tests/LiveClientTests.cpp similarity index 100% rename from test/aws-cpp-sdk-s3-encryption-integration-tests/LiveClientTests.cpp rename to tests/aws-cpp-sdk-s3-encryption-integration-tests/LiveClientTests.cpp diff --git a/test/aws-cpp-sdk-s3-encryption-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-s3-encryption-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-s3-encryption-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-s3-encryption-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-s3-encryption-tests/CMakeLists.txt b/tests/aws-cpp-sdk-s3-encryption-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-s3-encryption-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-s3-encryption-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-s3-encryption-tests/CryptoModulesTest.cpp b/tests/aws-cpp-sdk-s3-encryption-tests/CryptoModulesTest.cpp similarity index 100% rename from test/aws-cpp-sdk-s3-encryption-tests/CryptoModulesTest.cpp rename to tests/aws-cpp-sdk-s3-encryption-tests/CryptoModulesTest.cpp diff --git a/test/aws-cpp-sdk-s3-encryption-tests/DataHandlersTest.cpp b/tests/aws-cpp-sdk-s3-encryption-tests/DataHandlersTest.cpp similarity index 100% rename from test/aws-cpp-sdk-s3-encryption-tests/DataHandlersTest.cpp rename to tests/aws-cpp-sdk-s3-encryption-tests/DataHandlersTest.cpp diff --git a/test/aws-cpp-sdk-s3-encryption-tests/EncryptionMaterialsTest.cpp b/tests/aws-cpp-sdk-s3-encryption-tests/EncryptionMaterialsTest.cpp similarity index 100% rename from test/aws-cpp-sdk-s3-encryption-tests/EncryptionMaterialsTest.cpp rename to tests/aws-cpp-sdk-s3-encryption-tests/EncryptionMaterialsTest.cpp diff --git a/test/aws-cpp-sdk-s3-encryption-tests/RunTests.cpp b/tests/aws-cpp-sdk-s3-encryption-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-s3-encryption-tests/RunTests.cpp rename to tests/aws-cpp-sdk-s3-encryption-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp b/tests/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp similarity index 100% rename from test/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp rename to tests/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp diff --git a/test/aws-cpp-sdk-s3-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-s3-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-s3-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-s3-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-s3-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-s3-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-s3-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-s3-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-s3control-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-s3control-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-s3control-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-s3control-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-s3control-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-s3control-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-s3control-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-s3control-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp b/tests/aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp similarity index 100% rename from test/aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp rename to tests/aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp diff --git a/test/aws-cpp-sdk-sqs-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-sqs-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-sqs-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-sqs-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp b/tests/aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp similarity index 100% rename from test/aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp rename to tests/aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp diff --git a/test/aws-cpp-sdk-sqs-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-sqs-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-sqs-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-sqs-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-text-to-speech-tests/CMakeLists.txt b/tests/aws-cpp-sdk-text-to-speech-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-text-to-speech-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-text-to-speech-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-text-to-speech-tests/RunTests.cpp b/tests/aws-cpp-sdk-text-to-speech-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-text-to-speech-tests/RunTests.cpp rename to tests/aws-cpp-sdk-text-to-speech-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-text-to-speech-tests/TextToSpeechManagerTests.cpp b/tests/aws-cpp-sdk-text-to-speech-tests/TextToSpeechManagerTests.cpp similarity index 100% rename from test/aws-cpp-sdk-text-to-speech-tests/TextToSpeechManagerTests.cpp rename to tests/aws-cpp-sdk-text-to-speech-tests/TextToSpeechManagerTests.cpp diff --git a/test/aws-cpp-sdk-transcribestreaming-integration-tests/CMakeLists.txt b/tests/aws-cpp-sdk-transcribestreaming-integration-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-transcribestreaming-integration-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-transcribestreaming-integration-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-transcribestreaming-integration-tests/RunTests.cpp b/tests/aws-cpp-sdk-transcribestreaming-integration-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-transcribestreaming-integration-tests/RunTests.cpp rename to tests/aws-cpp-sdk-transcribestreaming-integration-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-transcribestreaming-integration-tests/TranscribeTests.cpp b/tests/aws-cpp-sdk-transcribestreaming-integration-tests/TranscribeTests.cpp similarity index 100% rename from test/aws-cpp-sdk-transcribestreaming-integration-tests/TranscribeTests.cpp rename to tests/aws-cpp-sdk-transcribestreaming-integration-tests/TranscribeTests.cpp diff --git a/test/aws-cpp-sdk-transfer-tests/CMakeLists.txt b/tests/aws-cpp-sdk-transfer-tests/CMakeLists.txt similarity index 100% rename from test/aws-cpp-sdk-transfer-tests/CMakeLists.txt rename to tests/aws-cpp-sdk-transfer-tests/CMakeLists.txt diff --git a/test/aws-cpp-sdk-transfer-tests/RunTests.cpp b/tests/aws-cpp-sdk-transfer-tests/RunTests.cpp similarity index 100% rename from test/aws-cpp-sdk-transfer-tests/RunTests.cpp rename to tests/aws-cpp-sdk-transfer-tests/RunTests.cpp diff --git a/test/aws-cpp-sdk-transfer-tests/TransferTests.cpp b/tests/aws-cpp-sdk-transfer-tests/TransferTests.cpp similarity index 100% rename from test/aws-cpp-sdk-transfer-tests/TransferTests.cpp rename to tests/aws-cpp-sdk-transfer-tests/TransferTests.cpp diff --git a/test/testing-resources/.gitignore b/tests/testing-resources/.gitignore similarity index 100% rename from test/testing-resources/.gitignore rename to tests/testing-resources/.gitignore diff --git a/test/testing-resources/CMakeLists.txt b/tests/testing-resources/CMakeLists.txt similarity index 100% rename from test/testing-resources/CMakeLists.txt rename to tests/testing-resources/CMakeLists.txt diff --git a/test/testing-resources/include/aws/external/gtest.h b/tests/testing-resources/include/aws/external/gtest.h similarity index 100% rename from test/testing-resources/include/aws/external/gtest.h rename to tests/testing-resources/include/aws/external/gtest.h diff --git a/test/testing-resources/include/aws/testing/MemoryTesting.h b/tests/testing-resources/include/aws/testing/MemoryTesting.h similarity index 100% rename from test/testing-resources/include/aws/testing/MemoryTesting.h rename to tests/testing-resources/include/aws/testing/MemoryTesting.h diff --git a/test/testing-resources/include/aws/testing/ProxyConfig.h b/tests/testing-resources/include/aws/testing/ProxyConfig.h similarity index 100% rename from test/testing-resources/include/aws/testing/ProxyConfig.h rename to tests/testing-resources/include/aws/testing/ProxyConfig.h diff --git a/test/testing-resources/include/aws/testing/TestingEnvironment.h b/tests/testing-resources/include/aws/testing/TestingEnvironment.h similarity index 100% rename from test/testing-resources/include/aws/testing/TestingEnvironment.h rename to tests/testing-resources/include/aws/testing/TestingEnvironment.h diff --git a/test/testing-resources/include/aws/testing/Testing_EXPORTS.h b/tests/testing-resources/include/aws/testing/Testing_EXPORTS.h similarity index 100% rename from test/testing-resources/include/aws/testing/Testing_EXPORTS.h rename to tests/testing-resources/include/aws/testing/Testing_EXPORTS.h diff --git a/test/testing-resources/include/aws/testing/mocks/aws/auth/MockAWSHttpResourceClient.h b/tests/testing-resources/include/aws/testing/mocks/aws/auth/MockAWSHttpResourceClient.h similarity index 100% rename from test/testing-resources/include/aws/testing/mocks/aws/auth/MockAWSHttpResourceClient.h rename to tests/testing-resources/include/aws/testing/mocks/aws/auth/MockAWSHttpResourceClient.h diff --git a/test/testing-resources/include/aws/testing/mocks/aws/client/MockAWSClient.h b/tests/testing-resources/include/aws/testing/mocks/aws/client/MockAWSClient.h similarity index 100% rename from test/testing-resources/include/aws/testing/mocks/aws/client/MockAWSClient.h rename to tests/testing-resources/include/aws/testing/mocks/aws/client/MockAWSClient.h diff --git a/test/testing-resources/include/aws/testing/mocks/event/MockEventStreamDecoder.h b/tests/testing-resources/include/aws/testing/mocks/event/MockEventStreamDecoder.h similarity index 100% rename from test/testing-resources/include/aws/testing/mocks/event/MockEventStreamDecoder.h rename to tests/testing-resources/include/aws/testing/mocks/event/MockEventStreamDecoder.h diff --git a/test/testing-resources/include/aws/testing/mocks/event/MockEventStreamHandler.h b/tests/testing-resources/include/aws/testing/mocks/event/MockEventStreamHandler.h similarity index 100% rename from test/testing-resources/include/aws/testing/mocks/event/MockEventStreamHandler.h rename to tests/testing-resources/include/aws/testing/mocks/event/MockEventStreamHandler.h diff --git a/test/testing-resources/include/aws/testing/mocks/http/MockHttpClient.h b/tests/testing-resources/include/aws/testing/mocks/http/MockHttpClient.h similarity index 100% rename from test/testing-resources/include/aws/testing/mocks/http/MockHttpClient.h rename to tests/testing-resources/include/aws/testing/mocks/http/MockHttpClient.h diff --git a/test/testing-resources/include/aws/testing/mocks/monitoring/TestingMonitoring.h b/tests/testing-resources/include/aws/testing/mocks/monitoring/TestingMonitoring.h similarity index 100% rename from test/testing-resources/include/aws/testing/mocks/monitoring/TestingMonitoring.h rename to tests/testing-resources/include/aws/testing/mocks/monitoring/TestingMonitoring.h diff --git a/test/testing-resources/include/aws/testing/platform/PlatformTesting.h b/tests/testing-resources/include/aws/testing/platform/PlatformTesting.h similarity index 100% rename from test/testing-resources/include/aws/testing/platform/PlatformTesting.h rename to tests/testing-resources/include/aws/testing/platform/PlatformTesting.h diff --git a/test/testing-resources/include/aws/testing/platform/android/AndroidTesting.h b/tests/testing-resources/include/aws/testing/platform/android/AndroidTesting.h similarity index 100% rename from test/testing-resources/include/aws/testing/platform/android/AndroidTesting.h rename to tests/testing-resources/include/aws/testing/platform/android/AndroidTesting.h diff --git a/test/testing-resources/source/MemoryTesting.cpp b/tests/testing-resources/source/MemoryTesting.cpp similarity index 100% rename from test/testing-resources/source/MemoryTesting.cpp rename to tests/testing-resources/source/MemoryTesting.cpp diff --git a/test/testing-resources/source/TestingEnvironment.cpp b/tests/testing-resources/source/TestingEnvironment.cpp similarity index 100% rename from test/testing-resources/source/TestingEnvironment.cpp rename to tests/testing-resources/source/TestingEnvironment.cpp diff --git a/test/testing-resources/source/external/gtest-all.cc b/tests/testing-resources/source/external/gtest-all.cc similarity index 100% rename from test/testing-resources/source/external/gtest-all.cc rename to tests/testing-resources/source/external/gtest-all.cc diff --git a/test/testing-resources/source/platform/android/AndroidTesting.cpp b/tests/testing-resources/source/platform/android/AndroidTesting.cpp similarity index 100% rename from test/testing-resources/source/platform/android/AndroidTesting.cpp rename to tests/testing-resources/source/platform/android/AndroidTesting.cpp diff --git a/test/testing-resources/source/platform/android/PlatformTesting.cpp b/tests/testing-resources/source/platform/android/PlatformTesting.cpp similarity index 100% rename from test/testing-resources/source/platform/android/PlatformTesting.cpp rename to tests/testing-resources/source/platform/android/PlatformTesting.cpp diff --git a/test/testing-resources/source/platform/linux-shared/PlatformTesting.cpp b/tests/testing-resources/source/platform/linux-shared/PlatformTesting.cpp similarity index 100% rename from test/testing-resources/source/platform/linux-shared/PlatformTesting.cpp rename to tests/testing-resources/source/platform/linux-shared/PlatformTesting.cpp diff --git a/test/testing-resources/source/platform/windows/PlatformTesting.cpp b/tests/testing-resources/source/platform/windows/PlatformTesting.cpp similarity index 100% rename from test/testing-resources/source/platform/windows/PlatformTesting.cpp rename to tests/testing-resources/source/platform/windows/PlatformTesting.cpp From f466d23888a054531da6d1cb76ee9c9d014c385e Mon Sep 17 00:00:00 2001 From: Damian Vicino Date: Mon, 13 Jun 2022 16:49:48 -0400 Subject: [PATCH 4/4] Basic core build --- CMakeLists.txt | 15 +++++++-- cmake/Findaws-crt-cpp.cmake | 22 +++++++++++-- src/aws-cpp-sdk-core/CMakeLists.txt | 8 +++++ src/aws-cpp-sdk-core/include/CMakeLists.txt | 4 +++ src/aws-cpp-sdk-core/source/CMakeLists.txt | 22 +++++++++++++ .../source/auth/CMakeLists.txt | 9 +++++ .../source/client/CMakeLists.txt | 12 +++++++ .../source/config/CMakeLists.txt | 5 +++ .../source/external/CMakeLists.txt | 1 + .../source/http/CMakeLists.txt | 15 +++++++++ .../source/http/curl/CMakeLists.txt | 5 +++ .../source/http/standard/CMakeLists.txt | 5 +++ .../source/http/windows/CMakeLists.txt | 11 +++++++ .../source/internal/CMakeLists.txt | 4 +++ .../source/monitoring/CMakeLists.txt | 6 ++++ .../source/net/CMakeLists.txt | 21 ++++++++++++ .../source/platform/CMakeLists.txt | 8 +++++ .../source/platform/android/CMakeLists.txt | 10 ++++++ .../platform/linux-shared/CMakeLists.txt | 8 +++++ .../source/platform/windows/CMakeLists.txt | 8 +++++ .../source/utils/CMakeLists.txt | 24 ++++++++++++++ .../source/utils/base64/CMakeLists.txt | 4 +++ .../source/utils/crypto/CMakeLists.txt | 33 +++++++++++++++++++ .../source/utils/crypto/bcrypt/CMakeLists.txt | 4 +++ .../utils/crypto/commoncrypto/CMakeLists.txt | 4 +++ .../utils/crypto/openssl/CMakeLists.txt | 4 +++ .../source/utils/event/CMakeLists.txt | 11 +++++++ .../source/utils/json/CMakeLists.txt | 4 +++ .../source/utils/logging/CMakeLists.txt | 10 ++++++ .../source/utils/memory/CMakeLists.txt | 5 +++ .../source/utils/stream/CMakeLists.txt | 7 ++++ .../source/utils/threading/CMakeLists.txt | 7 ++++ .../source/utils/xml/CMakeLists.txt | 4 +++ 33 files changed, 316 insertions(+), 4 deletions(-) create mode 100644 src/aws-cpp-sdk-core/include/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/auth/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/client/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/config/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/external/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/http/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/http/curl/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/http/standard/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/http/windows/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/internal/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/monitoring/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/net/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/platform/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/platform/android/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/platform/linux-shared/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/platform/windows/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/base64/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/crypto/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/crypto/commoncrypto/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/crypto/openssl/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/event/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/json/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/logging/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/memory/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/stream/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/threading/CMakeLists.txt create mode 100644 src/aws-cpp-sdk-core/source/utils/xml/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index b3a9cc2a9a6..38622900157 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,15 +73,26 @@ else () # Options definition option(BUILD_TESTING "If enabled, the SDK will include tests in the build" OFF) + # TODO: redefine below as option with proper defaults per platform + if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(ENABLE_COMMONCRYPTO_ENCRYPTION ON) + elseif (CMAKE_SYSTEM_NAME "Windows") + set(ENABLE_BCRYPT_ENCRYPTION ON) + elseif (CMAKE_SYSTEM_NAME "Linux") + set(ENABLE_OPENSSL_ENCRYPTION ON) + else () + message(FATAL_ERROR "Platform not yet supported by new build scripts") + endif () + # -- Dependencies -- add_subdirectory(dependencies) # -- main build targets -- add_subdirectory(src) + # -- Tests and packaging if running this as top project -- if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - # -- Test -- - # -- Packaging -- + add_subdirectory(tests) add_subdirectory(packaging) endif () message(WARNING "The dependencies are currently checked only for a basic Linux build, new ones need to be added for other platforms yet") diff --git a/cmake/Findaws-crt-cpp.cmake b/cmake/Findaws-crt-cpp.cmake index 96e74632f48..f3f296577f3 100644 --- a/cmake/Findaws-crt-cpp.cmake +++ b/cmake/Findaws-crt-cpp.cmake @@ -1,3 +1,21 @@ # This is a temporary mock file to be able to test our current build setup. -# The file will later be read from CRTpp installation -message(WARNING "aws-crt-cpp package is mocked for testing of experimental feature branch. Remove this file when CRT starts providing it.") \ No newline at end of file +# The file will later be read from aws-crt-cpp installation +include_guard() +message(WARNING "aws-crt-cpp package is mocked for testing of experimental feature branch. Remove this file when CRT starts providing it.") +# Setting include path to the submodule temporarily to unblock testing +# To make it build the crt submodule needs to be in-source build before calling this so generated files are created. +# Removing this work around soon, working in parallel in making aws-crt-cpp consumable by normal means +set(aws-crt-cpp_INCLUDE_DIRS + ${CMAKE_CURRENT_LIST_DIR}/../crt/aws-crt-cpp/include + ${CMAKE_CURRENT_LIST_DIR}/../crt/aws-crt-cpp/crt/aws-c-common/include + ${CMAKE_CURRENT_LIST_DIR}/../crt/aws-crt-cpp/crt/aws-c-io/include + ${CMAKE_CURRENT_LIST_DIR}/../crt/aws-crt-cpp/crt/aws-c-mqtt/include + ${CMAKE_CURRENT_LIST_DIR}/../crt/aws-crt-cpp/crt/aws-c-cal/include + ${CMAKE_CURRENT_LIST_DIR}/../crt/aws-crt-cpp/crt/aws-c-auth/include + ${CMAKE_CURRENT_LIST_DIR}/../crt/aws-crt-cpp/crt/aws-c-http/include + ${CMAKE_CURRENT_LIST_DIR}/../crt/aws-crt-cpp/crt/aws-c-event-stream/include + ${CMAKE_CURRENT_LIST_DIR}/../crt/aws-crt-cpp/crt/aws-checksums/include + ${CMAKE_CURRENT_LIST_DIR}/../crt/aws-crt-cpp/crt/aws-c-common/generated/include + PARENT_SCOPE + ) + diff --git a/src/aws-cpp-sdk-core/CMakeLists.txt b/src/aws-cpp-sdk-core/CMakeLists.txt index f5d577a487e..59f3d187d4f 100644 --- a/src/aws-cpp-sdk-core/CMakeLists.txt +++ b/src/aws-cpp-sdk-core/CMakeLists.txt @@ -1,5 +1,13 @@ if (NOT LEGACY_BUILD) message(WARNING "Building core with new cmake scripts not yet implemented") + add_library(aws-sdk-cpp-core) + add_library(aws-sdk-cpp::core ALIAS aws-sdk-cpp-core) + target_include_directories( + aws-sdk-cpp-core + PRIVATE ${aws-crt-cpp_INCLUDE_DIRS} + ) + add_subdirectory(include) + add_subdirectory(source) else () add_project(aws-cpp-sdk-core "Core http and utility library for the AWS C++ SDK") diff --git a/src/aws-cpp-sdk-core/include/CMakeLists.txt b/src/aws-cpp-sdk-core/include/CMakeLists.txt new file mode 100644 index 00000000000..55f90920126 --- /dev/null +++ b/src/aws-cpp-sdk-core/include/CMakeLists.txt @@ -0,0 +1,4 @@ +target_include_directories( + aws-sdk-cpp-core + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} +) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/CMakeLists.txt b/src/aws-cpp-sdk-core/source/CMakeLists.txt new file mode 100644 index 00000000000..d06fcc5ecff --- /dev/null +++ b/src/aws-cpp-sdk-core/source/CMakeLists.txt @@ -0,0 +1,22 @@ +add_subdirectory(auth) +add_subdirectory(client) +add_subdirectory(config) +add_subdirectory(http) +add_subdirectory(internal) +add_subdirectory(monitoring) +add_subdirectory(net) +add_subdirectory(platform) +add_subdirectory(utils) + +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Version.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AmazonSerializableWebServiceRequest.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AmazonStreamingWebServiceRequest.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AmazonWebServiceRequest.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Aws.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Globals.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Region.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Version.cpp + ) + diff --git a/src/aws-cpp-sdk-core/source/auth/CMakeLists.txt b/src/aws-cpp-sdk-core/source/auth/CMakeLists.txt new file mode 100644 index 00000000000..7b0bb21fcf3 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/auth/CMakeLists.txt @@ -0,0 +1,9 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/AWSAuthSigner.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AWSAuthSignerProvider.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AWSCredentialsProvider.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AWSCredentialsProviderChain.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/SSOCredentialsProvider.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/STSCredentialsProvider.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/client/CMakeLists.txt b/src/aws-cpp-sdk-core/source/client/CMakeLists.txt new file mode 100644 index 00000000000..a1987469686 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/client/CMakeLists.txt @@ -0,0 +1,12 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/AdaptiveRetryStrategy.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AsyncCallerContext.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AWSClient.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AWSErrorMarshaller.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ClientConfiguration.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/CoreErrors.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/DefaultRetryStrategy.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/RetryStrategy.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/SpecifiedRetryableErrorsRetryStrategy.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/config/CMakeLists.txt b/src/aws-cpp-sdk-core/source/config/CMakeLists.txt new file mode 100644 index 00000000000..4f4b10e6179 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/config/CMakeLists.txt @@ -0,0 +1,5 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/defaults/ClientConfigurationDefaults.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AWSProfileConfigLoader.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/external/CMakeLists.txt b/src/aws-cpp-sdk-core/source/external/CMakeLists.txt new file mode 100644 index 00000000000..9f816c7163e --- /dev/null +++ b/src/aws-cpp-sdk-core/source/external/CMakeLists.txt @@ -0,0 +1 @@ +message(FATAL_ERROR "Skip this directory when building with new build system") \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/http/CMakeLists.txt b/src/aws-cpp-sdk-core/source/http/CMakeLists.txt new file mode 100644 index 00000000000..a1a46a38162 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/http/CMakeLists.txt @@ -0,0 +1,15 @@ +add_subdirectory(standard) +if (NOT ${USE_CURL}) + add_subdirectory(windows) +else () + add_subdirectory(curl) +endif () +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/HttpClient.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/HttpClientFactory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/HttpRequest.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/HttpTypes.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Scheme.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/URI.cpp + ) diff --git a/src/aws-cpp-sdk-core/source/http/curl/CMakeLists.txt b/src/aws-cpp-sdk-core/source/http/curl/CMakeLists.txt new file mode 100644 index 00000000000..a85ae98178e --- /dev/null +++ b/src/aws-cpp-sdk-core/source/http/curl/CMakeLists.txt @@ -0,0 +1,5 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/CurlHandleContainer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/CurlHttpClient.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/http/standard/CMakeLists.txt b/src/aws-cpp-sdk-core/source/http/standard/CMakeLists.txt new file mode 100644 index 00000000000..8cf9a6d9769 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/http/standard/CMakeLists.txt @@ -0,0 +1,5 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/StandardHttpRequest.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/StandardHttpResponse.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/http/windows/CMakeLists.txt b/src/aws-cpp-sdk-core/source/http/windows/CMakeLists.txt new file mode 100644 index 00000000000..b2ebeadea9e --- /dev/null +++ b/src/aws-cpp-sdk-core/source/http/windows/CMakeLists.txt @@ -0,0 +1,11 @@ +message(FATAL_ERROR "Windows build not yet supported in new build system") +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/IXmlHttpRequest2HttpClient.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/WinConnectionPoolMgr.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/WinHttpConnectionPoolMgr.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/WinHttpSyncHttpClient.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/WinINetConnectionPoolMgr.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/WinINetSyncHttpClient.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/WinSyncHttpClient.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/internal/CMakeLists.txt b/src/aws-cpp-sdk-core/source/internal/CMakeLists.txt new file mode 100644 index 00000000000..86432fd8719 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/internal/CMakeLists.txt @@ -0,0 +1,4 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/AWSHttpResourceClient.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/monitoring/CMakeLists.txt b/src/aws-cpp-sdk-core/source/monitoring/CMakeLists.txt new file mode 100644 index 00000000000..5303b767ec3 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/monitoring/CMakeLists.txt @@ -0,0 +1,6 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/DefaultMonitoring.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/HttpClientMetrics.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/MonitoringManager.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/net/CMakeLists.txt b/src/aws-cpp-sdk-core/source/net/CMakeLists.txt new file mode 100644 index 00000000000..139a329464b --- /dev/null +++ b/src/aws-cpp-sdk-core/source/net/CMakeLists.txt @@ -0,0 +1,21 @@ +message(WARNING "aws-sdk-cpp-core net needs refactor on platform dependant codebase") +if (CMAKE_SYSTEM_NAME STREQUAL "Windows") + target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/windows/Net.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/windows/SimpleUDP.cpp + ) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") + target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/linux-shared/Net.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/linux-shared/SimpleUDP.cpp + ) +else () + target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Net.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/SimpleUDP.cpp + ) +endif () + diff --git a/src/aws-cpp-sdk-core/source/platform/CMakeLists.txt b/src/aws-cpp-sdk-core/source/platform/CMakeLists.txt new file mode 100644 index 00000000000..8b32c6c81dc --- /dev/null +++ b/src/aws-cpp-sdk-core/source/platform/CMakeLists.txt @@ -0,0 +1,8 @@ +message(WARNING "aws-sdk-cpp-core platform needs refactor on platform dependant codebase") +if (CMAKE_SYSTEM_NAME STREQUAL "Windows") + add_subdirectory(windows) +elseif (CMAKE_SYSTEM_NAME STREQUAL "Android") + add_subdirectory(android) +else () + add_subdirectory(linux-shared) +endif () \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/platform/android/CMakeLists.txt b/src/aws-cpp-sdk-core/source/platform/android/CMakeLists.txt new file mode 100644 index 00000000000..bbe0484fdf2 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/platform/android/CMakeLists.txt @@ -0,0 +1,10 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Environment.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/FileSystem.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/LogcatLogSystem.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/OSVersionInfo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Platform.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Security.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Time.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/platform/linux-shared/CMakeLists.txt b/src/aws-cpp-sdk-core/source/platform/linux-shared/CMakeLists.txt new file mode 100644 index 00000000000..7efba4b920c --- /dev/null +++ b/src/aws-cpp-sdk-core/source/platform/linux-shared/CMakeLists.txt @@ -0,0 +1,8 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Environment.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/FileSystem.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/OSVersionInfo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Security.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Time.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/platform/windows/CMakeLists.txt b/src/aws-cpp-sdk-core/source/platform/windows/CMakeLists.txt new file mode 100644 index 00000000000..7efba4b920c --- /dev/null +++ b/src/aws-cpp-sdk-core/source/platform/windows/CMakeLists.txt @@ -0,0 +1,8 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Environment.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/FileSystem.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/OSVersionInfo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Security.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Time.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/CMakeLists.txt new file mode 100644 index 00000000000..de6b77fac6d --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/CMakeLists.txt @@ -0,0 +1,24 @@ +add_subdirectory(base64) +add_subdirectory(crypto) +add_subdirectory(event) +add_subdirectory(json) +add_subdirectory(logging) +add_subdirectory(memory) +add_subdirectory(stream) +add_subdirectory(threading) +add_subdirectory(xml) + +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/DateTimeCommon.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Directory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/DNS.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Document.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/EnumParseOverflowContainer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/FileSystemUtils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/GetTheLights.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/HashingUtils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/StringUtils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/TempFile.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/UUID.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/base64/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/base64/CMakeLists.txt new file mode 100644 index 00000000000..8f22adf6b75 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/base64/CMakeLists.txt @@ -0,0 +1,4 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Base64.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/crypto/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/crypto/CMakeLists.txt new file mode 100644 index 00000000000..46ad4fd7081 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/crypto/CMakeLists.txt @@ -0,0 +1,33 @@ +message(WARNING "not complete implementation yet") +if (USE_OPENSSL) + add_subdirectory(openssl) +endif () +if (USE_BCRYPT) + +endif () +if (ENABLE_BCRYPT_ENCRYPTION) + add_subdirectory(bcrypt) +elseif (ENABLE_OPENSSL_ENCRYPTION) + add_subdirectory(openssl) +elseif (ENABLE_COMMONCRYPTO_ENCRYPTION) + add_subdirectory(commoncrypto) +else () + message(FATAL_ERROR "No crypto library enabled") +endif () + +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Cipher.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ContentCryptoMaterial.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ContentCryptoScheme.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/CRC32.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/CryptoBuf.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/CryptoStream.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/EncryptionMaterials.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/KeyWrapAlgorithm.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/MD5.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Sha1.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Sha256.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Sha256HMAC.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/factory/Factories.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CMakeLists.txt new file mode 100644 index 00000000000..36c50c8348f --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CMakeLists.txt @@ -0,0 +1,4 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/CryptoImpl.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/crypto/commoncrypto/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/crypto/commoncrypto/CMakeLists.txt new file mode 100644 index 00000000000..36c50c8348f --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/crypto/commoncrypto/CMakeLists.txt @@ -0,0 +1,4 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/CryptoImpl.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/crypto/openssl/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/crypto/openssl/CMakeLists.txt new file mode 100644 index 00000000000..36c50c8348f --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/crypto/openssl/CMakeLists.txt @@ -0,0 +1,4 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/CryptoImpl.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/event/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/event/CMakeLists.txt new file mode 100644 index 00000000000..69cb0f489eb --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/event/CMakeLists.txt @@ -0,0 +1,11 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/EventDecoderStream.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/EventEncoderStream.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/EventHeader.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/EventMessage.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/EventStreamBuf.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/EventStreamDecoder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/EventStreamEncoder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/EventStreamErrors.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/json/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/json/CMakeLists.txt new file mode 100644 index 00000000000..092426668f2 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/json/CMakeLists.txt @@ -0,0 +1,4 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/JsonSerializer.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/logging/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/logging/CMakeLists.txt new file mode 100644 index 00000000000..fa938386c2a --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/logging/CMakeLists.txt @@ -0,0 +1,10 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/AWSLogging.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ConsoleLogSystem.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/CRTLogging.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/CRTLogSystem.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/DefaultLogSystem.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/FormattedLogSystem.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/LogLevel.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/memory/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/memory/CMakeLists.txt new file mode 100644 index 00000000000..b6884d620d4 --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/memory/CMakeLists.txt @@ -0,0 +1,5 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/stl/SimpleStringStream.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/AWSMemory.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/stream/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/stream/CMakeLists.txt new file mode 100644 index 00000000000..b415bbbd1ac --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/stream/CMakeLists.txt @@ -0,0 +1,7 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/ConcurrentStreamBuf.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/PreallocatedStreamBuf.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ResponseStream.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/SimpleStreamBuf.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/threading/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/threading/CMakeLists.txt new file mode 100644 index 00000000000..19b11a08e5e --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/threading/CMakeLists.txt @@ -0,0 +1,7 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Executor.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ReaderWriterLock.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Semaphore.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ThreadTask.cpp + ) \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/utils/xml/CMakeLists.txt b/src/aws-cpp-sdk-core/source/utils/xml/CMakeLists.txt new file mode 100644 index 00000000000..629bdafb40f --- /dev/null +++ b/src/aws-cpp-sdk-core/source/utils/xml/CMakeLists.txt @@ -0,0 +1,4 @@ +target_sources(aws-sdk-cpp-core + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/XmlSerializer.cpp + ) \ No newline at end of file