From 6712f1b6af19da1b0c39f59aed772c50cfb80b50 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 15 Sep 2025 20:09:37 +0200 Subject: [PATCH] Use --list-for-cmake with generate_config_checks.py Signed-off-by: Gilles Peskine --- library/CMakeLists.txt | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index b31d2ea70e..063703bfe8 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -77,23 +77,11 @@ if(GEN_FILES) COMMAND ${MBEDTLS_PYTHON_EXECUTABLE} ${MBEDTLS_DIR}/scripts/generate_config_checks.py - --list "" + --list-for-cmake "${CMAKE_CURRENT_BINARY_DIR}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/.. OUTPUT_VARIABLE MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS) - # Turn newline-terminated non-empty list into semicolon-separated list. - string(REPLACE "\n" ";" - MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS "${MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS}") - string(REGEX REPLACE ";\$" "" - MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS "${MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS}") - # Prepend the binary dir to all element of MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS, - # using features that exist in CMake 3.5.1. - string(REPLACE ";" ";${CMAKE_CURRENT_BINARY_DIR}/" - MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS - "${MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS}") - set(MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS - "${CMAKE_CURRENT_BINARY_DIR}/${MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS}") add_custom_command( OUTPUT ${MBEDTLS_GENERATED_CONFIG_CHECKS_HEADERS}