Fix long-standing issues in CMakeLists.txt

awslabs · Dec 20, 2024 · 1927b13 · 1927b13
1 parent a947367
commit 1927b13
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 55 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)
 
 if(POLICY CMP0077)
     cmake_policy(SET CMP0077 NEW)
@@ -31,19 +31,7 @@ project("aws-crt-cpp"
 
 include(CTest)
 
-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)
@@ -65,13 +53,6 @@ set(GENERATED_INCLUDE_DIR "${GENERATED_ROOT_DIR}/include")
 set(GENERATED_CONFIG_HEADER "${GENERATED_INCLUDE_DIR}/aws/crt/Config.h")
 configure_file(include/aws/crt/Config.h.in ${GENERATED_CONFIG_HEADER} @ONLY)
 
-# 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})
-
 if(BUILD_DEPS)
     list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/crt/aws-c-common/cmake")
 
@@ -132,6 +113,9 @@ if(BUILD_DEPS)
     add_subdirectory(crt/aws-c-s3)
     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()
@@ -356,23 +340,23 @@ aws_add_sanitizers(${PROJECT_NAME})
 
 target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
 
-install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
-install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development)
-install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "include/aws/crt/checksum" COMPONENT Development)
-install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development)
-install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development)
-install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development)
-install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development)
-install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development)
-install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "include/aws/crt/endpoints" COMPONENT Development)
-install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "include/aws/crt/cbor" COMPONENT Development)
+install(FILES ${AWS_CRT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt" COMPONENT Development)
+install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/auth" COMPONENT Development)
+install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/checksum" COMPONENT Development)
+install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/crypto" COMPONENT Development)
+install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/io" COMPONENT Development)
+install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iot" COMPONENT Development)
+install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development)
+install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development)
+install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development)
+install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/cbor" COMPONENT Development)
 
 install(
     TARGETS ${PROJECT_NAME}
     EXPORT ${PROJECT_NAME}-targets
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
-    RUNTIME DESTINATION bin COMPONENT Runtime
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
 )
 
 if(BUILD_SHARED_LIBS)
@@ -382,7 +366,7 @@ else()
 endif()
 
 install(EXPORT "${PROJECT_NAME}-targets"
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/${TARGET_DIR}"
     NAMESPACE AWS::
     COMPONENT Development)
 
@@ -398,11 +382,11 @@ write_basic_package_version_file(
 )
 
 install(FILES "${GENERATED_ROOT_DIR}/${PROJECT_NAME}-config.cmake"
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/"
     COMPONENT Development)
 
 install(FILES "${GENERATED_ROOT_DIR}/${PROJECT_NAME}-config-version.cmake"
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/"
     COMPONENT Development)
 
 if(NOT CMAKE_CROSSCOMPILING)

diff --git a/bin/elasticurl_cpp/CMakeLists.txt b/bin/elasticurl_cpp/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(elasticurl_cpp CXX)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/lib/cmake")
-
 file(GLOB ELASTICURL_CPP_SRC
         "*.cpp"
         )
@@ -43,5 +41,5 @@ install(TARGETS ${ELASTICURL_CPP_PROJECT_NAME}
         EXPORT ${ELASTICURL_CPP_PROJECT_NAME}-targets
         COMPONENT Runtime
         RUNTIME
-        DESTINATION bin
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
         COMPONENT Runtime)
diff --git a/bin/mqtt5_app/CMakeLists.txt b/bin/mqtt5_app/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(mqtt5_app CXX)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/lib/cmake")
-
 file(GLOB MQTT5_APP_SRC
         "*.cpp"
         )
@@ -43,5 +41,5 @@ install(TARGETS ${MQTT5_APP_PROJECT_NAME}
         EXPORT ${MQTT5_APP_PROJECT_NAME}-targets
         COMPONENT Runtime
         RUNTIME
-        DESTINATION bin
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
         COMPONENT Runtime)
diff --git a/bin/mqtt5_canary/CMakeLists.txt b/bin/mqtt5_canary/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(mqtt5_canary CXX)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/lib/cmake")
-
 file(GLOB MQTT5_CANARY_SRC
         "*.cpp"
         )
@@ -43,5 +41,5 @@ install(TARGETS ${MQTT5_CANARY_PROJECT_NAME}
         EXPORT ${MQTT5_CANARY_PROJECT_NAME}-targets
         COMPONENT Runtime
         RUNTIME
-        DESTINATION bin
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
         COMPONENT Runtime)
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
+7 −23		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 −6		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
+7 −2		include/aws/s3/private/s3_checksums.h
+7 −0		include/aws/s3/private/s3_meta_request_impl.h
+1 −15		include/aws/s3/s3.h
+37 −0		include/aws/s3/s3_client.h
+1 −3		samples/s3/CMakeLists.txt
+0 −27		samples/s3/s3-platform_info.c
+1 −0		source/s3.c
+56 −68		source/s3_auto_ranged_put.c
+111 −3		source/s3_checksums.c
+3 −34		source/s3_client.c
+29 −15		source/s3_meta_request.c
+1 −150		source/s3_platform_info.c
+4 −2		source/s3_request_messages.c
+5 −0		source/s3_util.c
+2 −0		tests/CMakeLists.txt
+47 −14		tests/s3_data_plane_tests.c
+28 −10		tests/s3_tester.c
+7 −1		tests/s3_tester.h
+80 −30		.github/workflows/ci.yml
+18 −12		.github/workflows/codecov.yml
+8 −24		CMakeLists.txt
+2 −2		tests/endpoints_regex_tests.c