mirror of
				https://github.com/Mbed-TLS/mbedtls.git
				synced 2025-11-03 20:33:16 +03:00 
			
		
		
		
	cmake: Add TF_PSA_CRYPTO_DIR
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
		@@ -35,6 +35,9 @@ if(LIB_INSTALL_DIR)
 | 
				
			|||||||
    set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}")
 | 
					    set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}")
 | 
				
			||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Set the project root directory.
 | 
				
			||||||
 | 
					set(TF_PSA_CRYPTO_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
add_subdirectory(include)
 | 
					add_subdirectory(include)
 | 
				
			||||||
add_subdirectory(core)
 | 
					add_subdirectory(core)
 | 
				
			||||||
add_subdirectory(drivers)
 | 
					add_subdirectory(drivers)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -129,11 +129,11 @@ foreach(target IN LISTS target_libraries)
 | 
				
			|||||||
    # from core/ and drivers/builtin/src/.
 | 
					    # from core/ and drivers/builtin/src/.
 | 
				
			||||||
    target_include_directories(${target}
 | 
					    target_include_directories(${target}
 | 
				
			||||||
        PUBLIC $<BUILD_INTERFACE:${MBEDTLS_DIR}/include/>
 | 
					        PUBLIC $<BUILD_INTERFACE:${MBEDTLS_DIR}/include/>
 | 
				
			||||||
               $<BUILD_INTERFACE:${MBEDTLS_DIR}/tf-psa-crypto/include/>
 | 
					               $<BUILD_INTERFACE:${TF_PSA_CRYPTO_DIR}/include/>
 | 
				
			||||||
               $<BUILD_INTERFACE:${MBEDTLS_DIR}/tf-psa-crypto/drivers/builtin/include/>
 | 
					               $<BUILD_INTERFACE:${TF_PSA_CRYPTO_DIR}/drivers/builtin/include/>
 | 
				
			||||||
               $<INSTALL_INTERFACE:include/>
 | 
					               $<INSTALL_INTERFACE:include/>
 | 
				
			||||||
        PRIVATE ${MBEDTLS_DIR}/tf-psa-crypto/core
 | 
					        PRIVATE ${TF_PSA_CRYPTO_DIR}/core
 | 
				
			||||||
                ${MBEDTLS_DIR}/tf-psa-crypto/drivers/builtin/src
 | 
					                ${TF_PSA_CRYPTO_DIR}/drivers/builtin/src
 | 
				
			||||||
                # Needed to include psa_crypto_driver_wrappers.h
 | 
					                # Needed to include psa_crypto_driver_wrappers.h
 | 
				
			||||||
                ${CMAKE_CURRENT_BINARY_DIR})
 | 
					                ${CMAKE_CURRENT_BINARY_DIR})
 | 
				
			||||||
    # Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
 | 
					    # Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -128,8 +128,8 @@ foreach (target IN LISTS target_libraries)
 | 
				
			|||||||
      PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
 | 
					      PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
 | 
				
			||||||
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 | 
					             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 | 
				
			||||||
             $<BUILD_INTERFACE:${MBEDTLS_DIR}/include>
 | 
					             $<BUILD_INTERFACE:${MBEDTLS_DIR}/include>
 | 
				
			||||||
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
 | 
					             $<BUILD_INTERFACE:${TF_PSA_CRYPTO_DIR}/include>
 | 
				
			||||||
      PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../core)
 | 
					      PRIVATE ${TF_PSA_CRYPTO_DIR}/core)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
 | 
					    # Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
 | 
				
			||||||
    # This must be duplicated from library/CMakeLists.txt because
 | 
					    # This must be duplicated from library/CMakeLists.txt because
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,13 +8,13 @@ add_library(${everest_target}
 | 
				
			|||||||
target_include_directories(${everest_target}
 | 
					target_include_directories(${everest_target}
 | 
				
			||||||
  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 | 
					  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 | 
				
			||||||
         $<BUILD_INTERFACE:${MBEDTLS_DIR}/include>
 | 
					         $<BUILD_INTERFACE:${MBEDTLS_DIR}/include>
 | 
				
			||||||
         $<BUILD_INTERFACE:${MBEDTLS_DIR}/tf-psa-crypto/include>
 | 
					         $<BUILD_INTERFACE:${TF_PSA_CRYPTO_DIR}/include>
 | 
				
			||||||
         $<BUILD_INTERFACE:${MBEDTLS_DIR}/tf-psa-crypto/drivers/builtin/include>
 | 
					         $<BUILD_INTERFACE:${TF_PSA_CRYPTO_DIR}/drivers/builtin/include>
 | 
				
			||||||
         $<INSTALL_INTERFACE:include>
 | 
					         $<INSTALL_INTERFACE:include>
 | 
				
			||||||
  PRIVATE include/everest
 | 
					  PRIVATE include/everest
 | 
				
			||||||
          include/everest/kremlib
 | 
					          include/everest/kremlib
 | 
				
			||||||
          ${MBEDTLS_DIR}/library
 | 
					          ${MBEDTLS_DIR}/library
 | 
				
			||||||
          ${MBEDTLS_DIR}/tf-psa-crypto/core)
 | 
					          ${TF_PSA_CRYPTO_DIR}/core)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
 | 
					# Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
 | 
				
			||||||
# This must be duplicated from library/CMakeLists.txt because
 | 
					# This must be duplicated from library/CMakeLists.txt because
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,11 +8,11 @@ target_include_directories(${p256m_target}
 | 
				
			|||||||
  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 | 
					  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 | 
				
			||||||
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/p256-m>
 | 
					         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/p256-m>
 | 
				
			||||||
         $<BUILD_INTERFACE:${MBEDTLS_DIR}/include>
 | 
					         $<BUILD_INTERFACE:${MBEDTLS_DIR}/include>
 | 
				
			||||||
         $<BUILD_INTERFACE:${MBEDTLS_DIR}/tf-psa-crypto/include>
 | 
					         $<BUILD_INTERFACE:${TF_PSA_CRYPTO_DIR}/include>
 | 
				
			||||||
         $<BUILD_INTERFACE:${MBEDTLS_DIR}/tf-psa-crypto/drivers/builtin/include>
 | 
					         $<BUILD_INTERFACE:${TF_PSA_CRYPTO_DIR}/drivers/builtin/include>
 | 
				
			||||||
         $<INSTALL_INTERFACE:include>
 | 
					         $<INSTALL_INTERFACE:include>
 | 
				
			||||||
  PRIVATE ${MBEDTLS_DIR}/library/
 | 
					  PRIVATE ${MBEDTLS_DIR}/library/
 | 
				
			||||||
          ${MBEDTLS_DIR}/tf-psa-crypto/core)
 | 
					          ${TF_PSA_CRYPTO_DIR}/core)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
 | 
					# Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
 | 
				
			||||||
# This must be duplicated from library/CMakeLists.txt because
 | 
					# This must be duplicated from library/CMakeLists.txt because
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user