lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-07 06:42:56 +03:00
Code Activity

Merge pull request #10313 from ronald-cron-arm/dependency-on-generated-files-dev

Browse Source 
cmake: library: Fix potential concurrent file generation
This commit is contained in:
Gilles Peskine
2025-07-30 11:44:18 +00:00
committed by GitHub
parent ae9dbaae3f db99ca95a7
commit 3e23cdc754
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.d/fix-dependency-on-generated-files.txt Normal file
View File

@@ -0,0 +1,3 @@
Bugfix
* Fix potential CMake parallel build failure when building both the static
and shared libraries.

29
library/CMakeLists.txt
View File

@@ -85,10 +85,17 @@ if(GEN_FILES)
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/generate_ssl_debug_helpers.py ${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/generate_ssl_debug_helpers.py
${tls_error_headers} ${tls_error_headers}
) )
else()
link_to_source(error.c) add_custom_target(${MBEDTLS_TARGET_PREFIX}mbedx509_generated_files_target
link_to_source(version_features.c) DEPENDS
link_to_source(ssl_debug_helpers_generated.c) ${CMAKE_CURRENT_BINARY_DIR}/error.c
)
add_custom_target(${MBEDTLS_TARGET_PREFIX}mbedtls_generated_files_target
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/ssl_debug_helpers_generated.c
${CMAKE_CURRENT_BINARY_DIR}/version_features.c
)
endif() endif()
if(CMAKE_COMPILER_IS_GNUCC) if(CMAKE_COMPILER_IS_GNUCC)
@@ -166,6 +173,13 @@ if(USE_STATIC_MBEDTLS_LIBRARY)
target_compile_options(${mbedtls_static_target} PRIVATE ${LIBS_C_FLAGS}) target_compile_options(${mbedtls_static_target} PRIVATE ${LIBS_C_FLAGS})
set_target_properties(${mbedtls_static_target} PROPERTIES OUTPUT_NAME mbedtls) set_target_properties(${mbedtls_static_target} PROPERTIES OUTPUT_NAME mbedtls)
target_link_libraries(${mbedtls_static_target} PUBLIC ${libs} ${mbedx509_static_target}) target_link_libraries(${mbedtls_static_target} PUBLIC ${libs} ${mbedx509_static_target})
if(GEN_FILES)
add_dependencies(${mbedx509_static_target}
${MBEDTLS_TARGET_PREFIX}mbedx509_generated_files_target)
add_dependencies(${mbedtls_static_target}
${MBEDTLS_TARGET_PREFIX}mbedtls_generated_files_target)
endif()
endif(USE_STATIC_MBEDTLS_LIBRARY) endif(USE_STATIC_MBEDTLS_LIBRARY)
if(USE_SHARED_MBEDTLS_LIBRARY) if(USE_SHARED_MBEDTLS_LIBRARY)
@@ -180,6 +194,13 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
target_compile_options(${mbedtls_target} PRIVATE ${LIBS_C_FLAGS}) target_compile_options(${mbedtls_target} PRIVATE ${LIBS_C_FLAGS})
set_target_properties(${mbedtls_target} PROPERTIES VERSION 4.0.0 SOVERSION 21) set_target_properties(${mbedtls_target} PROPERTIES VERSION 4.0.0 SOVERSION 21)
target_link_libraries(${mbedtls_target} PUBLIC ${libs} ${mbedx509_target}) target_link_libraries(${mbedtls_target} PUBLIC ${libs} ${mbedx509_target})
if(GEN_FILES)
add_dependencies(${mbedx509_target}
${MBEDTLS_TARGET_PREFIX}mbedx509_generated_files_target)
add_dependencies(${mbedtls_target}
${MBEDTLS_TARGET_PREFIX}mbedtls_generated_files_target)
endif()
endif(USE_SHARED_MBEDTLS_LIBRARY) endif(USE_SHARED_MBEDTLS_LIBRARY)
foreach(target IN LISTS target_libraries) foreach(target IN LISTS target_libraries)