From 102015e5a2d295a8075a93f163eb59bf1b78cf15 Mon Sep 17 00:00:00 2001
From: "Jonathan M. Henson" <henso@amazon.com>
Date: Tue, 28 Jan 2020 16:47:38 -0800
Subject: [PATCH] Update deps fix cmake templates (#94)

* Updated dependencies to latest, fixed cmake template files.

* Don't need the finder module updates anymore.

* Update aws-c-io for new libcrypto dependency mess, and pull in some minor bug fixes from s2n.

* Make sure tests don't get built accidentally this time.
---
 CMakeLists.txt                       | 9 +++++----
 aws-common-runtime/aws-c-auth        | 2 +-
 aws-common-runtime/aws-c-cal         | 2 +-
 aws-common-runtime/aws-c-common      | 2 +-
 aws-common-runtime/aws-c-compression | 2 +-
 aws-common-runtime/aws-c-http        | 2 +-
 aws-common-runtime/aws-c-io          | 2 +-
 aws-common-runtime/aws-c-mqtt        | 2 +-
 aws-common-runtime/s2n               | 2 +-
 tests/CMakeLists.txt                 | 2 +-
 10 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1ff08c3d..798e8dee1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,13 +46,11 @@ if (BUILD_DEPS)
     include(AwsFindPackage)
 
     set(IN_SOURCE_BUILD ON)
-    set(BUILD_TESTING_PREV BUILD_TESTING)
+    set(BUILD_TESTING_PREV ${BUILD_TESTING})
     set(BUILD_TESTING OFF)
     add_subdirectory(aws-common-runtime/aws-c-common)
 
     if (UNIX AND NOT APPLE)
-        list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/aws-common-runtime/s2n/cmake/modules")
-        find_package(LibCrypto REQUIRED)
         add_subdirectory(aws-common-runtime/s2n)
     endif()
 
@@ -62,7 +60,7 @@ if (BUILD_DEPS)
     add_subdirectory(aws-common-runtime/aws-c-http)
     add_subdirectory(aws-common-runtime/aws-c-auth)
     add_subdirectory(aws-common-runtime/aws-c-mqtt)
-    set(BUILD_TESTING BUILD_TESTING_PREV)
+    set(BUILD_TESTING ${BUILD_TESTING_PREV})
 else()
     include(AwsFindPackage)
     set(IN_SOURCE_BUILD OFF)
@@ -210,6 +208,9 @@ aws_use_package(aws-c-http)
 aws_use_package(aws-c-mqtt)
 aws_use_package(aws-c-cal)
 aws_use_package(aws-c-auth)
+aws_use_package(aws-c-common)
+aws_use_package(aws-c-io)
+
 target_link_libraries(${PROJECT_NAME} ${DEP_AWS_LIBS})
 
 install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
diff --git a/aws-common-runtime/aws-c-auth b/aws-common-runtime/aws-c-auth
index 8281ad698..a3bd1ecfa 160000
--- a/aws-common-runtime/aws-c-auth
+++ b/aws-common-runtime/aws-c-auth
@@ -1 +1 @@
-Subproject commit 8281ad6989d815bb59fa5612a43193ec3795ff7b
+Subproject commit a3bd1ecfa457722592a97e965bdea80d5d893661
diff --git a/aws-common-runtime/aws-c-cal b/aws-common-runtime/aws-c-cal
index 5f562759e..d6640edb0 160000
--- a/aws-common-runtime/aws-c-cal
+++ b/aws-common-runtime/aws-c-cal
@@ -1 +1 @@
-Subproject commit 5f562759e759b8f86df128f3f52c5dba8d300529
+Subproject commit d6640edb0366fa4b58b5ff0179144cf3ad7879cd
diff --git a/aws-common-runtime/aws-c-common b/aws-common-runtime/aws-c-common
index 045024d73..b0ea9f35d 160000
--- a/aws-common-runtime/aws-c-common
+++ b/aws-common-runtime/aws-c-common
@@ -1 +1 @@
-Subproject commit 045024d735c64a1e488827e4b70b20b3295be4ef
+Subproject commit b0ea9f35df8934f9e03fc3bab3919d55efd69b88
diff --git a/aws-common-runtime/aws-c-compression b/aws-common-runtime/aws-c-compression
index 45d6ba1f1..11bb853f7 160000
--- a/aws-common-runtime/aws-c-compression
+++ b/aws-common-runtime/aws-c-compression
@@ -1 +1 @@
-Subproject commit 45d6ba1f1edf323728dbcfaa60afc91e004d4d3f
+Subproject commit 11bb853f771ace42ef0ca5ca74992c910da058e1
diff --git a/aws-common-runtime/aws-c-http b/aws-common-runtime/aws-c-http
index 232f3358a..4abad0db6 160000
--- a/aws-common-runtime/aws-c-http
+++ b/aws-common-runtime/aws-c-http
@@ -1 +1 @@
-Subproject commit 232f3358a7eab67f18c18332a6510838f749eca3
+Subproject commit 4abad0db65ab744614030dbfe81851ed598c8a1b
diff --git a/aws-common-runtime/aws-c-io b/aws-common-runtime/aws-c-io
index 250484cc0..deba1a7e3 160000
--- a/aws-common-runtime/aws-c-io
+++ b/aws-common-runtime/aws-c-io
@@ -1 +1 @@
-Subproject commit 250484cc0e985cc9bc8ffb0591c5d74c6541f113
+Subproject commit deba1a7e30e9200f2993358992b4b4bfec706189
diff --git a/aws-common-runtime/aws-c-mqtt b/aws-common-runtime/aws-c-mqtt
index 9895e4d16..4d22db86b 160000
--- a/aws-common-runtime/aws-c-mqtt
+++ b/aws-common-runtime/aws-c-mqtt
@@ -1 +1 @@
-Subproject commit 9895e4d16c8e68dcf3ab40fed9f2ca0c2a52e24e
+Subproject commit 4d22db86b86bdabff4d9b2dbf57a2431734f74da
diff --git a/aws-common-runtime/s2n b/aws-common-runtime/s2n
index b4e5153cb..a977c4477 160000
--- a/aws-common-runtime/s2n
+++ b/aws-common-runtime/s2n
@@ -1 +1 @@
-Subproject commit b4e5153cbe4cf154eb3e9543c26b785d330e0b5c
+Subproject commit a977c447702c11e515876d896416e50ce1bc9adf
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3268c25c6..c6ee051f9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -21,7 +21,7 @@ add_test_case(SHA256ResourceSafety)
 add_test_case(MD5ResourceSafety)
 add_test_case(SHA256HMACResourceSafety)
 add_net_test_case(HttpDownloadNoBackPressure)
-add_test_case(IotPublishSubscribe)
+add_net_test_case(IotPublishSubscribe)
 add_net_test_case(HttpClientConnectionManagerResourceSafety)
 add_net_test_case(HttpClientConnectionWithPendingAcquisitions)
 add_net_test_case(HttpClientConnectionWithPendingAcquisitionsAndClosedConnections)