From a9219ff73d1db4756111650e6f0e0988bb38f05e Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Wed, 23 Oct 2024 09:23:46 +0200 Subject: [PATCH] Add project prefix to API documentation targets To avoid conflict between the two targets when the integration of the TF-PSA-Crypto build system into the Mbed TLS one is completed. Signed-off-by: Ronald Cron --- CMakeLists.txt | 4 ++-- tf-psa-crypto/CMakeLists.txt | 2 +- tf-psa-crypto/TF-PSA-Crypto.cmake | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aef67471f..556df31d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ # - MBEDTLS_TARGET_PREFIX: CMake targets are designed to be alterable by calling # CMake in order to avoid target name clashes, via the use of # MBEDTLS_TARGET_PREFIX. The value of this variable is prefixed to the -# mbedtls, mbedx509, mbedcrypto and apidoc targets. +# mbedtls, mbedx509, mbedcrypto and mbedtls-apidoc targets. # # We specify a minimum requirement of 3.10.2, but for now use 3.5.1 here @@ -463,7 +463,7 @@ if(ENABLE_PROGRAMS) add_subdirectory(programs) endif() -ADD_CUSTOM_TARGET(${MBEDTLS_TARGET_PREFIX}apidoc +ADD_CUSTOM_TARGET(${MBEDTLS_TARGET_PREFIX}mbedtls-apidoc COMMAND doxygen mbedtls.doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doxygen) diff --git a/tf-psa-crypto/CMakeLists.txt b/tf-psa-crypto/CMakeLists.txt index 21eb64e6f..363d1de39 100644 --- a/tf-psa-crypto/CMakeLists.txt +++ b/tf-psa-crypto/CMakeLists.txt @@ -13,7 +13,7 @@ # - TF_PSA_CRYPTO_TARGET_PREFIX: CMake targets are designed to be alterable by # calling CMake in order to avoid target name clashes, via the use of # TF_PSA_CRYPTO_TARGET_PREFIX. The value of this variable is prefixed to the -# tfpsacrypto and apidoc targets. +# tfpsacrypto and tfpsacrypto-apidoc targets. # # We specify a minimum requirement of 3.10.2, but for now use 3.5.1 here diff --git a/tf-psa-crypto/TF-PSA-Crypto.cmake b/tf-psa-crypto/TF-PSA-Crypto.cmake index 142a9d354..3b06641ba 100644 --- a/tf-psa-crypto/TF-PSA-Crypto.cmake +++ b/tf-psa-crypto/TF-PSA-Crypto.cmake @@ -23,7 +23,7 @@ foreach(file ${version_number_files}) ${TF_PSA_CRYPTO_DIR}/${file}) endforeach(file) -ADD_CUSTOM_TARGET(${TF_PSA_CRYPTO_TARGET_PREFIX}apidoc +ADD_CUSTOM_TARGET(${TF_PSA_CRYPTO_TARGET_PREFIX}tfpsacrypto-apidoc COMMAND doxygen tfpsacrypto.doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doxygen)