Merge pull request #547 from Begasus/includedir

Use GNUIstalldir CMAKE_INSTALL_INCLUDEDIR for headers installation

Author: minosgalanakis

ChangeLog.d/gnuinstalldirs_include.txt

@@ -0,0 +1,3 @@
+Bugfix
+   * CMake now installs headers to `CMAKE_INSTALL_INCLUDEDIR` instead of the
+     hard-coded `include` directory.

core/CMakeLists.txt

@@ -172,7 +172,7 @@ foreach(target IN LISTS target_libraries)
                $<BUILD_INTERFACE:${TF_PSA_CRYPTO_DIR}/drivers/builtin/include/>
                $<BUILD_INTERFACE:${TF_PSA_CRYPTO_DIR}/drivers/everest/include/>
                $<BUILD_INTERFACE:${TF_PSA_CRYPTO_DIR}/drivers/p256-m/>
-               $<INSTALL_INTERFACE:include/>
+               $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
         PRIVATE ${TF_PSA_CRYPTO_DIR}/core
                 ${TF_PSA_CRYPTO_DIR}/drivers/builtin/src
                 # Needed to include psa_crypto_driver_wrappers.h

drivers/builtin/CMakeLists.txt

@@ -60,7 +60,7 @@ endif(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
 if(INSTALL_TF_PSA_CRYPTO_HEADERS)
 
   install(DIRECTORY include/mbedtls
-    DESTINATION include
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
     DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE

drivers/everest/CMakeLists.txt

@@ -32,7 +32,7 @@ endif(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
 if(INSTALL_TF_PSA_CRYPTO_HEADERS)
 
   install(DIRECTORY include/tf-psa-crypto/private/everest
-    DESTINATION include/tf-psa-crypto/private/everest
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tf-psa-crypto/private/everest
     FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
     DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     FILES_MATCHING PATTERN "*.h")

include/CMakeLists.txt

@@ -6,15 +6,15 @@ if(INSTALL_TF_PSA_CRYPTO_HEADERS)
     file(GLOB mbedtls_crypto_headers "../drivers/builtin/include/mbedtls/*.h" "mbedtls/*.h")
 
     install(FILES ${psa_headers}
-        DESTINATION include/psa
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/psa
         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 
     install(FILES ${tf-psa-crypto_headers}
-        DESTINATION include/tf-psa-crypto
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tf-psa-crypto
         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 
     install(FILES ${mbedtls_crypto_headers}
-        DESTINATION include/mbedtls
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mbedtls
         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 endif(INSTALL_TF_PSA_CRYPTO_HEADERS)