yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8261 from Mbed-TLS/fix-cmake-header-include

Browse source 
Add CMake include path for generated header
This commit is contained in:
Gilles Peskine 2023-09-28 15:16:15 +00:00 committed by GitHub
commit 42f8d5f0c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/CMakeLists.txt
View file

@ -323,7 +323,9 @@ foreach(target IN LISTS target_libraries)
target_include_directories(${target} target_include_directories(${target}
PUBLIC $<BUILD_INTERFACE:${MBEDTLS_DIR}/include/> PUBLIC $<BUILD_INTERFACE:${MBEDTLS_DIR}/include/>
$<INSTALL_INTERFACE:include/> $<INSTALL_INTERFACE:include/>
PRIVATE ${MBEDTLS_DIR}/library/) PRIVATE ${MBEDTLS_DIR}/library/
# Needed to include psa_crypto_driver_wrappers.h
${CMAKE_CURRENT_BINARY_DIR})
# Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE # Pass-through MBEDTLS_CONFIG_FILE and MBEDTLS_USER_CONFIG_FILE
if(MBEDTLS_CONFIG_FILE) if(MBEDTLS_CONFIG_FILE)
target_compile_definitions(${target} target_compile_definitions(${target}

4
programs/test/cmake_package/CMakeLists.txt
View file

@ -13,7 +13,9 @@ execute_process(
"-H${MbedTLS_SOURCE_DIR}" "-H${MbedTLS_SOURCE_DIR}"
"-B${MbedTLS_BINARY_DIR}" "-B${MbedTLS_BINARY_DIR}"
"-DENABLE_PROGRAMS=NO" "-DENABLE_PROGRAMS=NO"
"-DENABLE_TESTING=NO") "-DENABLE_TESTING=NO"
# Turn on generated files explicitly in case this is a release
"-DGEN_FILES=ON")
execute_process( execute_process(
COMMAND "${CMAKE_COMMAND}" COMMAND "${CMAKE_COMMAND}"

2
programs/test/cmake_package_install/CMakeLists.txt
View file

@ -15,6 +15,8 @@ execute_process(
"-B${MbedTLS_BINARY_DIR}" "-B${MbedTLS_BINARY_DIR}"
"-DENABLE_PROGRAMS=NO" "-DENABLE_PROGRAMS=NO"
"-DENABLE_TESTING=NO" "-DENABLE_TESTING=NO"
# Turn on generated files explicitly in case this is a release
"-DGEN_FILES=ON"
"-DCMAKE_INSTALL_PREFIX=${MbedTLS_INSTALL_DIR}") "-DCMAKE_INSTALL_PREFIX=${MbedTLS_INSTALL_DIR}")
execute_process( execute_process(

22
tests/scripts/all.sh
View file

@ -5256,11 +5256,16 @@ support_test_cmake_out_of_source () {
} }
component_test_cmake_out_of_source () { component_test_cmake_out_of_source () {
# Remove existing generated files so that we use the ones cmake
# generates
make neat
msg "build: cmake 'out-of-source' build" msg "build: cmake 'out-of-source' build"
MBEDTLS_ROOT_DIR="$PWD" MBEDTLS_ROOT_DIR="$PWD"
mkdir "$OUT_OF_SOURCE_DIR" mkdir "$OUT_OF_SOURCE_DIR"
cd "$OUT_OF_SOURCE_DIR" cd "$OUT_OF_SOURCE_DIR"
cmake -D CMAKE_BUILD_TYPE:String=Check "$MBEDTLS_ROOT_DIR" # Note: Explicitly generate files as these are turned off in releases
cmake -D CMAKE_BUILD_TYPE:String=Check -D GEN_FILES=ON "$MBEDTLS_ROOT_DIR"
make make
msg "test: cmake 'out-of-source' build" msg "test: cmake 'out-of-source' build"
@ -5281,9 +5286,14 @@ component_test_cmake_out_of_source () {
} }
component_test_cmake_as_subdirectory () { component_test_cmake_as_subdirectory () {
# Remove existing generated files so that we use the ones CMake
# generates
make neat
msg "build: cmake 'as-subdirectory' build" msg "build: cmake 'as-subdirectory' build"
cd programs/test/cmake_subproject cd programs/test/cmake_subproject
cmake . # Note: Explicitly generate files as these are turned off in releases
cmake -D GEN_FILES=ON .
make make
./cmake_subproject ./cmake_subproject
} }
@ -5292,6 +5302,10 @@ support_test_cmake_as_subdirectory () {
} }
component_test_cmake_as_package () { component_test_cmake_as_package () {
# Remove existing generated files so that we use the ones CMake
# generates
make neat
msg "build: cmake 'as-package' build" msg "build: cmake 'as-package' build"
cd programs/test/cmake_package cd programs/test/cmake_package
cmake . cmake .
@ -5303,6 +5317,10 @@ support_test_cmake_as_package () {
} }
component_test_cmake_as_package_install () { component_test_cmake_as_package_install () {
# Remove existing generated files so that we use the ones CMake
# generates
make neat
msg "build: cmake 'as-installed-package' build" msg "build: cmake 'as-installed-package' build"
cd programs/test/cmake_package_install cd programs/test/cmake_package_install
cmake . cmake .