build: Make includedir properly overrideable

[jtojnar]

Issue #, if available: None

Description of changes: This is required by some package managers like Nix.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

[bretambrose]

This seems like a reasonable change. That being said, the same thing needs to be done on

• https://github.com/awslabs/aws-c-common
• https://github.com/awslabs/aws-c-io
• https://github.com/awslabs/aws-checksums
• https://github.com/awslabs/aws-c-event-stream
• https://github.com/awslabs/aws-c-http
• https://github.com/awslabs/aws-c-mqtt
• https://github.com/awslabs/aws-c-auth
• https://github.com/awslabs/aws-c-s3
• https://github.com/awslabs/aws-c-cal
• https://github.com/awslabs/aws-c-iot
• https://github.com/awslabs/aws-c-sdkutils
• https://github.com/awslabs/aws-c-compression
• https://github.com/aws/aws-iot-device-sdk-cpp-v2

as well as (not under our control):

• https://github.com/aws/s2n-tls
• https://github.com/awslabs/aws-lc

I definitely don't expect you to do this, though. I'll check in with some wiser people, and if they have no objections, I will propagate the change to all subsidiary libraries.

[Artturin]

Conflicts resolved

From b3a46b9a2a9f86ff416a0ff5f84882c0dedebd14 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <[email protected]>
Date: Sun, 9 Jan 2022 01:57:18 +0100
Subject: [PATCH] build: Make includedir properly overrideable

This is required by some package managers like Nix.

Co-authored-by: Artturin <[email protected]>
---
 CMakeLists.txt | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f062ca..b28f13c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,10 @@ if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
     set(FIND_LIBRARY_USE_LIB64_PATHS true)
 endif()
 
+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
+    set(CMAKE_INSTALL_INCLUDEDIR "include")
+endif()
+
 if(NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 11)
 endif()
@@ -329,7 +333,7 @@ endif()
 target_include_directories(${PROJECT_NAME} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
-    $<INSTALL_INTERFACE:include>)
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 aws_use_package(aws-c-http)
 aws_use_package(aws-c-mqtt)
@@ -346,16 +350,16 @@ 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}
-- 
2.46.0

Btw why are all the releases in this repo pre-releases?

[sbSteveK]

I'm closing this PR as the changes have been implemented.

[Artturin]

This change is still missing because the include dir is actually at /nix/store/03qff58m9hh0kcf6lbc59dnkkxcjf39w-aws-crt-cpp-0.33.1-dev/include

set(_IMPORT_PREFIX "/nix/store/sq59ycd5cc4rnkg4xzz2x6na5rw3kgif-aws-crt-cpp-0.33.1")
# Create imported target AWS::aws-crt-cpp
add_library(AWS::aws-crt-cpp SHARED IMPORTED)
set_target_properties(AWS::aws-crt-cpp PROPERTIES
  INTERFACE_COMPILE_DEFINITIONS "AWS_CRT_CPP_USE_IMPORT_EXPORT;AWS_CRT_CPP_USE_IMPORT_EXPORT"
  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" # THIS IS WRONG