From 495dfe850fdd316284aa9e362ce80b1e827110e8 Mon Sep 17 00:00:00 2001
From: Igor Abdrakhimov <octosyllabic@gmail.com>
Date: Thu, 30 Jan 2025 10:35:34 -0800
Subject: [PATCH] Cmake modules (#864)

---
 CMakeLists.txt         | 33 +++++----------------------------
 crt/aws-c-auth         |  2 +-
 crt/aws-c-cal          |  2 +-
 crt/aws-c-common       |  2 +-
 crt/aws-c-compression  |  2 +-
 crt/aws-c-event-stream |  2 +-
 crt/aws-c-http         |  2 +-
 crt/aws-c-io           |  2 +-
 crt/aws-c-mqtt         |  2 +-
 crt/aws-c-s3           |  2 +-
 crt/aws-c-sdkutils     |  2 +-
 crt/aws-checksums      |  2 +-
 12 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11e0c451f..f0998655a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,30 +1,10 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 
 project(aws-crt-jni C)
 option(BUILD_DEPS "Builds aws common runtime dependencies as part of build" ON)
 option(CRT_FIPS "Whether to build aws-lc with FIPS compliance" OFF)
 
-if (POLICY CMP0077)
-    cmake_policy(SET CMP0077 NEW) # Enable options to get their values from normal variables
-endif()
-
-if (DEFINED CMAKE_PREFIX_PATH)
-    file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
-endif()
-
-if (DEFINED CMAKE_INSTALL_PREFIX)
-    file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX)
-endif()
-
-if (UNIX AND NOT APPLE)
-    include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-endif()
-
-if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-    set(FIND_LIBRARY_USE_LIB64_PATHS true)
-endif()
+include(GNUInstallDirs)
 
 if (NOT WIN32 AND NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "RelWithDebInfo")
@@ -32,12 +12,6 @@ endif()
 
 message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
 
-# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
-# Append that generated list to the module search path
-list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
-
 # Local CMake scripts
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
@@ -111,6 +85,9 @@ if (BUILD_DEPS)
     add_subdirectory(crt/aws-c-event-stream)
     add_subdirectory(crt/aws-c-s3)
 else()
+    # this is required so we can use aws-c-common's CMake modules
+    find_package(aws-c-common REQUIRED)
+
     include(AwsFindPackage)
     include(AwsCFlags)
     set(IN_SOURCE_BUILD OFF)
diff --git a/crt/aws-c-auth b/crt/aws-c-auth
index 8927de4dc..b513db4bf 160000
--- a/crt/aws-c-auth
+++ b/crt/aws-c-auth
@@ -1 +1 @@
-Subproject commit 8927de4dcff6faab948e801aeeca3ac9a57caab7
+Subproject commit b513db4bf82429a1134fecbd6d12e5fda45255a6
diff --git a/crt/aws-c-cal b/crt/aws-c-cal
index fbbe2612a..7299c6ab9 160000
--- a/crt/aws-c-cal
+++ b/crt/aws-c-cal
@@ -1 +1 @@
-Subproject commit fbbe2612a3385d1ded02a52d20ad7fd2da4501f4
+Subproject commit 7299c6ab9244595b140d604475cdd6c6921be8ae
diff --git a/crt/aws-c-common b/crt/aws-c-common
index 5e6c08186..0e7637fa8 160000
--- a/crt/aws-c-common
+++ b/crt/aws-c-common
@@ -1 +1 @@
-Subproject commit 5e6c08186fa5d8c7679acf95b86ada4119ca23b8
+Subproject commit 0e7637fa852a472bd4c37fc07a325a09c942a5fc
diff --git a/crt/aws-c-compression b/crt/aws-c-compression
index c6c1191e5..f951ab2b8 160000
--- a/crt/aws-c-compression
+++ b/crt/aws-c-compression
@@ -1 +1 @@
-Subproject commit c6c1191e525e5aa6ead9e1afc392e35d3b50331e
+Subproject commit f951ab2b819fc6993b6e5e6cfef64b1a1554bfc8
diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream
index d2dcc9344..9422ef78a 160000
--- a/crt/aws-c-event-stream
+++ b/crt/aws-c-event-stream
@@ -1 +1 @@
-Subproject commit d2dcc9344dae24de320866045d85166d8a91a0d1
+Subproject commit 9422ef78aac566414d1bebb1a5431a4c53a7547c
diff --git a/crt/aws-c-http b/crt/aws-c-http
index fc3eded24..590c7b597 160000
--- a/crt/aws-c-http
+++ b/crt/aws-c-http
@@ -1 +1 @@
-Subproject commit fc3eded2465c37d07fd9cc15e9b5b011224c9c9a
+Subproject commit 590c7b597f87e5edc080b8b77418690c30319832
diff --git a/crt/aws-c-io b/crt/aws-c-io
index fcb38c804..3041dabfc 160000
--- a/crt/aws-c-io
+++ b/crt/aws-c-io
@@ -1 +1 @@
-Subproject commit fcb38c804364dd627c335da752a99a125a88f6e9
+Subproject commit 3041dabfc13fe9bc9a0467e15aa1d5a09c7fc06f
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
index 627c3334e..83247bde8 160000
--- a/crt/aws-c-mqtt
+++ b/crt/aws-c-mqtt
@@ -1 +1 @@
-Subproject commit 627c3334e52021aa8d5772b6ca076884610f3219
+Subproject commit 83247bde8268905018327891fcf0147f3e438a80
diff --git a/crt/aws-c-s3 b/crt/aws-c-s3
index a3b401bfb..6eb8be530 160000
--- a/crt/aws-c-s3
+++ b/crt/aws-c-s3
@@ -1 +1 @@
-Subproject commit a3b401bfb53c28c88a930d496b481311dd76a4f5
+Subproject commit 6eb8be530b100fed5c6d24ca48a57ee2e6098fbf
diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils
index 1ae8664f9..ba6a28fab 160000
--- a/crt/aws-c-sdkutils
+++ b/crt/aws-c-sdkutils
@@ -1 +1 @@
-Subproject commit 1ae8664f90cb5ab5e23b161a31e021c6d3a28e72
+Subproject commit ba6a28fab7ed5d7f1b3b1d12eb672088be093824
diff --git a/crt/aws-checksums b/crt/aws-checksums
index 3e4101b9f..fb8bd0b8c 160000
--- a/crt/aws-checksums
+++ b/crt/aws-checksums
@@ -1 +1 @@
-Subproject commit 3e4101b9f85a2c090774d27ae2131fca1082f522
+Subproject commit fb8bd0b8cff00c8c24a35d601fce1b4c611df6da