Various CMake improvements

awslabs · Dec 20, 2024 · 197c8c5 · 197c8c5
1 parent f01fbf0
commit 197c8c5
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 35 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,26 +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()
+include(GNUInstallDirs)
 
 if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
     set(FIND_LIBRARY_USE_LIB64_PATHS true)
@@ -32,12 +16,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 +89,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
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-s3 b/crt/aws-c-s3
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
+159 −74		.github/workflows/ci.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 −1		AWSCRTAndroidTestRunner/app/src/main/cpp/CMakeLists.txt
+6 −10		CMakeLists.txt
+0 −2		bin/system_info/CMakeLists.txt
+9 −13		cmake/AwsSharedLibSetup.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
+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
+34 −17		.github/workflows/ci.yml
+7 −23		CMakeLists.txt
+1 −15		include/aws/s3/s3.h
+1 −3		samples/s3/CMakeLists.txt
+0 −27		samples/s3/s3-platform_info.c
+1 −0		source/s3.c
+3 −4		source/s3_client.c
+1 −150		source/s3_platform_info.c
+5 −0		source/s3_util.c
+80 −30		.github/workflows/ci.yml
+18 −12		.github/workflows/codecov.yml
+8 −24		CMakeLists.txt
+2 −2		tests/endpoints_regex_tests.c