diff options
| author | David Horstmann <david.horstmann@arm.com> | 2023-10-06 11:48:44 +0100 |
|---|---|---|
| committer | Dave Rodgman <dave.rodgman@arm.com> | 2023-11-03 12:28:41 +0000 |
| commit | b63134a9103a77c1a7f835a6a6871bcc21fc2d76 (patch) | |
| tree | 8012e491f64e439834ba16f5b35c73c1563c29dc | |
| parent | 0a403d4fd6ec98df1361e3de45fbb87a3fbc66af (diff) | |
| download | mbedtls-b63134a9103a77c1a7f835a6a6871bcc21fc2d76.tar.gz | |
Fix 3rdparty target names for custom config
Use the correct names qualified by MBEDTLS_TARGET_PREFIX.
Signed-off-by: David Horstmann <david.horstmann@arm.com>
| -rw-r--r-- | 3rdparty/everest/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | 3rdparty/p256-m/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ChangeLog.d/fix-3rdparty-target-prefix.txt | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/3rdparty/everest/CMakeLists.txt b/3rdparty/everest/CMakeLists.txt index eefc15151..e0e5adecd 100644 --- a/3rdparty/everest/CMakeLists.txt +++ b/3rdparty/everest/CMakeLists.txt @@ -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() diff --git a/3rdparty/p256-m/CMakeLists.txt b/3rdparty/p256-m/CMakeLists.txt index 41be3c4a3..2ef0d48b7 100644 --- a/3rdparty/p256-m/CMakeLists.txt +++ b/3rdparty/p256-m/CMakeLists.txt @@ -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() diff --git a/ChangeLog.d/fix-3rdparty-target-prefix.txt b/ChangeLog.d/fix-3rdparty-target-prefix.txt new file mode 100644 index 000000000..db8ed07ee --- /dev/null +++ b/ChangeLog.d/fix-3rdparty-target-prefix.txt @@ -0,0 +1,3 @@ +Bugfix + * Fix accidental omission of MBEDTLS_TARGET_PREFIX in 3rdparty modules + in CMake. |