commit 6712f1b6af19da1b0c39f59aed772c50cfb80b50
author Gilles Peskine <Gilles.Peskine@arm.com> Mon Sep 15 20:09:37 2025 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Fri Sep 19 13:36:25 2025 +0200
tree e45de804d2ee44a2ed26b1e7a65d063a078d9643
parent 67b115cfda5fe3e2e221c58d86ed40623f6634f9

Use --list-for-cmake with generate_config_checks.py

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/CMakeLists.txt

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index b31d2ea..063703b 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -77,23 +77,11 @@
         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}