From 6eb8be530b100fed5c6d24ca48a57ee2e6098fbf Mon Sep 17 00:00:00 2001
From: Michael Graeb <graebm@amazon.com>
Date: Tue, 28 Jan 2025 15:11:30 -0800
Subject: [PATCH] A bunch of CMake fixes (#480)
---
CMakeLists.txt | 31 ++++++++-----------------------
samples/s3/CMakeLists.txt | 4 +---
2 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebd989fea..dc49e2152 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
project(aws-c-s3 C)
option(ASSERT_LOCK_HELD "Enable ASSERT_SYNCED_DATA_LOCK_HELD for checking thread issue" OFF)
@@ -11,32 +11,17 @@ if (ASSERT_LOCK_HELD)
add_definitions(-DASSERT_LOCK_HELD)
endif()
-if (DEFINED CMAKE_PREFIX_PATH)
- file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
+if (NOT IN_SOURCE_BUILD)
+ # this is required so we can use aws-c-common's CMake modules
+ find_package(aws-c-common REQUIRED)
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()
-
-# 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(AwsCFlags)
include(AwsCheckHeaders)
include(AwsSharedLibSetup)
include(AwsSanitizers)
include(AwsFindPackage)
+include(GNUInstallDirs)
file(GLOB AWS_S3_ROOT_HEADERS
"include/aws/s3/*.h"
@@ -100,7 +85,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
aws_prepare_shared_lib_exports(${PROJECT_NAME})
-install(FILES ${AWS_S3_ROOT_HEADERS} DESTINATION "include/aws/s3" COMPONENT Development)
+install(FILES ${AWS_S3_ROOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/s3" COMPONENT Development)
if (BUILD_SHARED_LIBS)
set (TARGET_DIR "shared")
@@ -109,7 +94,7 @@ else()
endif()
install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/${TARGET_DIR}/"
NAMESPACE AWS::
COMPONENT Development)
@@ -118,7 +103,7 @@ configure_file("cmake/${PROJECT_NAME}-config.cmake"
@ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/"
COMPONENT Development)
include(CTest)
diff --git a/samples/s3/CMakeLists.txt b/samples/s3/CMakeLists.txt
index 2e8d48618..461d2084e 100644
--- a/samples/s3/CMakeLists.txt
+++ b/samples/s3/CMakeLists.txt
@@ -1,7 +1,5 @@
project(s3 C)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake")
-
file(GLOB S3_SRC
"*.c"
)
@@ -25,5 +23,5 @@ install(TARGETS ${S3_PROJECT_NAME}
EXPORT ${S3_PROJECT_NAME}-targets
COMPONENT Runtime
RUNTIME
- DESTINATION bin
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT Runtime)