awslabs · sfod · Jan 30, 2025 · Dec 20, 2024 · Dec 23, 2024 · Jan 29, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 project(aws-crt-nodejs C)
 option(BUILD_DEPS "Builds aws common runtime dependencies as part of build, only do this if you don't want to control your dependency chain." ON)
 
@@ -14,21 +14,7 @@ if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE RelWithDebInfo)
 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()
-
-# 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})
+include(GNUInstallDirs)
 
 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/dist")
 
@@ -76,12 +62,13 @@ if (BUILD_DEPS)
 
     set(BUILD_TESTING ${BUILD_TESTING_PREV})
 else()
+    # this is required so we can use aws-c-common's CMake modules
+    find_package(aws-c-common REQUIRED)
+
     include(AwsFindPackage)
     set(IN_SOURCE_BUILD OFF)
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
 include(AwsCFlags)
 include(AwsSharedLibSetup)
 include(AwsSanitizers)

diff --git a/crt/aws-c-auth b/crt/aws-c-auth
diff --git a/crt/aws-c-cal b/crt/aws-c-cal
diff --git a/crt/aws-c-common b/crt/aws-c-common
diff --git a/crt/aws-c-compression b/crt/aws-c-compression
diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream
diff --git a/crt/aws-c-http b/crt/aws-c-http
diff --git a/crt/aws-c-io b/crt/aws-c-io
diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt
diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils
diff --git a/crt/aws-checksums b/crt/aws-checksums
+159 −74		.github/workflows/ci.yml
+9 −22		CMakeLists.txt
+0 −2		bin/produce_x_platform_fuzz_corpus/CMakeLists.txt
+0 −2		bin/run_x_platform_fuzz_corpus/CMakeLists.txt
+0 −2		bin/sha256_profile/CMakeLists.txt
+1 −1		AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt
+7 −10		CMakeLists.txt
+0 −2		bin/system_info/CMakeLists.txt
+6 −20		cmake/AwsSharedLibSetup.cmake
+1 −1		cmake/CPackConfig.cmake
+3 −0		cmake/aws-c-common-config.cmake
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+76 −26		.github/workflows/ci.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+9 −23		CMakeLists.txt
+1 −1		source/huffman_generator/CMakeLists.txt
+2 −3		source/huffman_generator/generator.c
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+80 −31		.github/workflows/ci.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+8 −32		CMakeLists.txt
+134 −51		.github/workflows/ci.yml
+8 −22		CMakeLists.txt
+1 −3		bin/elasticurl/CMakeLists.txt
+1 −1		builder.json
+172 −73		.github/workflows/ci.yml
+3 −3		.github/workflows/proof-alarm.yml
+33 −34		CMakeLists.txt
+26 −0		include/aws/io/event_loop.h
+25 −8		include/aws/io/private/event_loop_impl.h
+72 −0		include/aws/io/private/socket_impl.h
+31 −15		include/aws/io/socket.h
+0 −1		include/aws/testing/io_testing_channel.h
+3 −1		source/bsd/kqueue_event_loop.c
+1 −1		source/darwin/secure_transport_tls_channel_handler.c
+167 −9		source/event_loop.c
+1 −1		source/linux/epoll_event_loop.c
+75 −44		source/posix/socket.c
+258 −0		source/socket.c
+1 −0		source/windows/host_resolver.c
+1 −1		source/windows/iocp/iocp_event_loop.c
+108 −81		source/windows/iocp/socket.c
+1 −0		source/windows/winsock_init.c
+6 −0		tests/CMakeLists.txt
+76 −3		tests/event_loop_test.c
+1 −1		tests/socket_handler_test.c
+48 −0		tests/socket_test.c
+1 −1		tests/tls_handler_test.c
+2 −2		tests/vcc/Makefile
+3 −3		tests/vcc/new_destroy.c
+1 −1		tests/vcc/preamble.h
+12 −26		CMakeLists.txt
+1 −3		bin/elastipubsub/CMakeLists.txt
+1 −3		bin/elastipubsub5/CMakeLists.txt
+1 −3		bin/elastishadow/CMakeLists.txt
+1 −3		bin/mqtt5canary/CMakeLists.txt
+173 −95		.github/workflows/ci.yml
+8 −22		CMakeLists.txt
+1 −3		bin/benchmark/CMakeLists.txt
+0 −53		cmake/AwsSharedLibSetup.cmake