CMake improvements

awslabs · Dec 20, 2024 · df51efe · df51efe
1 parent 2eee416
commit df51efe
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 24 deletions.
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,22 +14,12 @@ 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()
+include(GNUInstallDirs)
 
 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})
-
 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/dist")
 
 if (BUILD_DEPS)
@@ -76,12 +66,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
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+7 −23		CMakeLists.txt
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+159 −74		.github/workflows/ci.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+8 −24		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 −0		include/aws/cal/rsa.h
+3 −0		source/darwin/securityframework_rsa.c
+2 −1		source/rsa.c
+9 −0		source/unix/openssl_rsa.c
+9 −2		source/windows/bcrypt_rsa.c
+3 −0		tests/CMakeLists.txt
+119 −1		tests/rsa_test.c
+144 −58		.github/workflows/ci.yml
+1 −1		.github/workflows/clang-tidy.yml
+12 −6		.github/workflows/codecov.yml
+4 −4		.github/workflows/proof_ci_resources/config.yaml
+1 −1		AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt
+6 −10		CMakeLists.txt
+0 −2		bin/system_info/CMakeLists.txt
+80 −7		cmake/AwsPrebuildDependency.cmake
+9 −13		cmake/AwsSharedLibSetup.cmake
+3 −0		cmake/aws-c-common-config.cmake
+2 −2		include/aws/common/cbor.h
+55 −15		tests/hash_table_test.c
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+76 −26		.github/workflows/ci.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+8 −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
+7 −32		CMakeLists.txt
+134 −51		.github/workflows/ci.yml
+7 −22		CMakeLists.txt
+1 −3		bin/elasticurl/CMakeLists.txt
+1 −1		builder.json
+162 −71		.github/workflows/ci.yml
+2 −2		.github/workflows/proof-alarm.yml
+8 −24		CMakeLists.txt
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+79 −30		.github/workflows/ci.yml
+18 −12		.github/workflows/codecov.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+11 −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
+2 −2		source/v5/mqtt5_options_storage.c
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+80 −30		.github/workflows/ci.yml
+18 −12		.github/workflows/codecov.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+8 −24		CMakeLists.txt
+1 −1		include/aws/sdkutils/private/endpoints_util.h
+2 −2		tests/endpoints_regex_tests.c
+8 −0		.github/ISSUE_TEMPLATE/bug-report.yml
+177 −74		.github/workflows/ci.yml
+32 −0		.github/workflows/issue-regression-labeler.yml
+7 −22		CMakeLists.txt
+1 −3		bin/benchmark/CMakeLists.txt
+11 −1		builder.json
+0 −53		cmake/AwsSharedLibSetup.cmake
+41 −0		include/aws/checksums/private/crc_util.h
+576 −12		source/crc64_sw.c
+8 −7		source/crc_sw.c
+4 −1		tests/crc64_test.c
+3 −2		tests/crc_test.c