build dev 1.10 pr15

src/CMakeLists.txt

@@ -1,4 +1 @@
 add_subdirectory(aws-cpp-sdk-core)
-if (BUILD_TESTING)
-    add_subdirectory(aws-cpp-sdk-core-tests)
-endif ()

src/aws-cpp-sdk-core/CMakeLists.txt

@@ -28,7 +28,6 @@ if (NOT LEGACY_BUILD)
             EXPORT_MACRO_NAME AWS_CORE_API # to be backward compatible during LEGACY_BUILD exist until 1.11
     )
 
-
     add_subdirectory(include)
     add_subdirectory(source)
 else ()

tests/CMakeLists.txt

@@ -0,0 +1,6 @@
+if (BUILD_TESTING)
+    add_subdirectory(../tests/testing-resources)
+    add_subdirectory(../tests/aws-cpp-sdk-core-tests)
+    # Integration testing
+    add_subdirectory(aws-cpp-sdk-dynamodb-integration-tests)
+endif ()

src/aws-cpp-sdk-core-tests/CMakeLists.txt → tests/aws-cpp-sdk-core-tests/CMakeLists.txt

@@ -5,6 +5,7 @@ if (NOT LEGACY_BUILD)
             aws-sdk-cpp-core-test
             GTest::GTest
             aws-sdk-cpp::core
+            aws-sdk-cpp::testing-resources
             aws-crt-cpp
     )
     target_sources(
@@ -17,7 +18,6 @@ if (NOT LEGACY_BUILD)
     add_subdirectory(aws)
     add_subdirectory(http)
     add_subdirectory(monitoring)
-    add_subdirectory(testing-resources)
     add_subdirectory(utils)
 
     gtest_discover_tests(aws-sdk-cpp-core-test)
@@ -29,11 +29,11 @@ else ()
 
     # Headers are included in the source so that they show up in Visual Studio.
     # They are included elsewhere for consistency.
-    file(GLOB AWS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/aws/*.cpp")
-    file(GLOB AWS_AUTH_SRC "${CMAKE_CURRENT_SOURCE_DIR}/aws/auth/*.cpp")
-    file(GLOB AWS_CONFIG_SRC "${CMAKE_CURRENT_SOURCE_DIR}/aws/config/*.cpp")
-    file(GLOB AWS_CLIENT_SRC "${CMAKE_CURRENT_SOURCE_DIR}/aws/client/*.cpp")
-    file(GLOB AWS_NET_SRC "${CMAKE_CURRENT_SOURCE_DIR}/aws/net/*.cpp")
+    file(GLOB AWS_SRC "aws/*.cpp")
+    file(GLOB AWS_AUTH_SRC "aws/auth/*.cpp")
+    file(GLOB AWS_CONFIG_SRC "aws/config/*.cpp")
+    file(GLOB AWS_CLIENT_SRC "aws/client/*.cpp")
+    file(GLOB AWS_NET_SRC "aws/net/*.cpp")
     file(GLOB HTTP_SRC "${CMAKE_CURRENT_SOURCE_DIR}/http/*.cpp")
     file(GLOB UTILS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/*.cpp")
     file(GLOB UTILS_CRYPTO_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/crypto/*.cpp")
@@ -131,7 +131,7 @@ else ()
 
     add_custom_command(TARGET aws-cpp-sdk-core-tests PRE_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_directory
-            ${CMAKE_CURRENT_SOURCE_DIR}/resources ${CMAKE_CURRENT_BINARY_DIR})
+            resources ${CMAKE_CURRENT_BINARY_DIR})
 
     if (ENABLE_HTTP_CLIENT_TESTING)
         add_definitions(-DENABLE_HTTP_CLIENT_TESTING)