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

Merge pull request #8319 from davidhorstmann-arm/fix-3rdparty-target-prefix

Browse source 
Fix 3rdparty target names for custom config
This commit is contained in:
Dave Rodgman 2023-10-06 18:07:50 +00:00 committed by GitHub
commit 4934ae7e25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
3rdparty/everest/CMakeLists.txt vendored
View file

@ -18,11 +18,11 @@ target_include_directories(${everest_target}
# everest is not directly linked against any mbedtls targets # everest is not directly linked against any mbedtls targets
# so does not inherit the compile definitions. # so does not inherit the compile definitions.
if(MBEDTLS_CONFIG_FILE) if(MBEDTLS_CONFIG_FILE)
target_compile_definitions(everest target_compile_definitions(${everest_target}
PUBLIC MBEDTLS_CONFIG_FILE="${MBEDTLS_CONFIG_FILE}") PUBLIC MBEDTLS_CONFIG_FILE="${MBEDTLS_CONFIG_FILE}")
endif() endif()
if(MBEDTLS_USER_CONFIG_FILE) if(MBEDTLS_USER_CONFIG_FILE)
target_compile_definitions(everest target_compile_definitions(${everest_target}
PUBLIC MBEDTLS_USER_CONFIG_FILE="${MBEDTLS_USER_CONFIG_FILE}") PUBLIC MBEDTLS_USER_CONFIG_FILE="${MBEDTLS_USER_CONFIG_FILE}")
endif() endif()

4
3rdparty/p256-m/CMakeLists.txt vendored
View file

@ -16,11 +16,11 @@ target_include_directories(${p256m_target}
# p256m is not directly linked against any mbedtls targets # p256m is not directly linked against any mbedtls targets
# so does not inherit the compile definitions. # so does not inherit the compile definitions.
if(MBEDTLS_CONFIG_FILE) if(MBEDTLS_CONFIG_FILE)
target_compile_definitions(p256m target_compile_definitions(${p256m_target}
PUBLIC MBEDTLS_CONFIG_FILE="${MBEDTLS_CONFIG_FILE}") PUBLIC MBEDTLS_CONFIG_FILE="${MBEDTLS_CONFIG_FILE}")
endif() endif()
if(MBEDTLS_USER_CONFIG_FILE) if(MBEDTLS_USER_CONFIG_FILE)
target_compile_definitions(p256m target_compile_definitions(${p256m_target}
PUBLIC MBEDTLS_USER_CONFIG_FILE="${MBEDTLS_USER_CONFIG_FILE}") PUBLIC MBEDTLS_USER_CONFIG_FILE="${MBEDTLS_USER_CONFIG_FILE}")
endif() endif()

3
ChangeLog.d/fix-3rdparty-target-prefix.txt Normal file
View file

@ -0,0 +1,3 @@
Bugfix
* Fix accidental omission of MBEDTLS_TARGET_PREFIX in 3rdparty modules
in CMake.