Merge pull request #8319 from davidhorstmann-arm/fix-3rdparty-target-prefix
Fix 3rdparty target names for custom config
This commit is contained in:
commit
4934ae7e25
3 changed files with 7 additions and 4 deletions
4
3rdparty/everest/CMakeLists.txt
vendored
4
3rdparty/everest/CMakeLists.txt
vendored
|
@ -18,11 +18,11 @@ target_include_directories(${everest_target}
|
|||
# everest is not directly linked against any mbedtls targets
|
||||
# so does not inherit the compile definitions.
|
||||
if(MBEDTLS_CONFIG_FILE)
|
||||
target_compile_definitions(everest
|
||||
target_compile_definitions(${everest_target}
|
||||
PUBLIC MBEDTLS_CONFIG_FILE="${MBEDTLS_CONFIG_FILE}")
|
||||
endif()
|
||||
if(MBEDTLS_USER_CONFIG_FILE)
|
||||
target_compile_definitions(everest
|
||||
target_compile_definitions(${everest_target}
|
||||
PUBLIC MBEDTLS_USER_CONFIG_FILE="${MBEDTLS_USER_CONFIG_FILE}")
|
||||
endif()
|
||||
|
||||
|
|
4
3rdparty/p256-m/CMakeLists.txt
vendored
4
3rdparty/p256-m/CMakeLists.txt
vendored
|
@ -16,11 +16,11 @@ target_include_directories(${p256m_target}
|
|||
# p256m is not directly linked against any mbedtls targets
|
||||
# so does not inherit the compile definitions.
|
||||
if(MBEDTLS_CONFIG_FILE)
|
||||
target_compile_definitions(p256m
|
||||
target_compile_definitions(${p256m_target}
|
||||
PUBLIC MBEDTLS_CONFIG_FILE="${MBEDTLS_CONFIG_FILE}")
|
||||
endif()
|
||||
if(MBEDTLS_USER_CONFIG_FILE)
|
||||
target_compile_definitions(p256m
|
||||
target_compile_definitions(${p256m_target}
|
||||
PUBLIC MBEDTLS_USER_CONFIG_FILE="${MBEDTLS_USER_CONFIG_FILE}")
|
||||
endif()
|
||||
|
||||
|
|
3
ChangeLog.d/fix-3rdparty-target-prefix.txt
Normal file
3
ChangeLog.d/fix-3rdparty-target-prefix.txt
Normal file
|
@ -0,0 +1,3 @@
|
|||
Bugfix
|
||||
* Fix accidental omission of MBEDTLS_TARGET_PREFIX in 3rdparty modules
|
||||
in CMake.
|
Loading…
Reference in a new issue