yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-23 02:45:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Fix added sources to targets

Browse Source 
In cmake version < 3.0, the SOURCES property on targets cannot be
modified after the target is defined.  There are several instances in
the code that were using `target_properties()`, which is not available
in the older versions of cmake.  Unfortunately, the workaround in #3801
(381c1078fc) assumes that this SOURCES property can be modified.

Work around this by building up any necessary sources before declaring
the target.  This is more awkward, but needed to continue to be able to
support the old versions of cmake.

Fixes #3788.

Signed-off-by: David Brown <david.brown@linaro.org>
This commit is contained in:
David Brown 2020-11-18 15:07:24 -07:00
parent 11ead84049
commit a8e309e01d
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
programs/fuzz/CMakeLists.txt
View File

@ -32,20 +32,24 @@ set(executables_with_common_c
foreach(exe IN LISTS executables_no_common_c executables_with_common_c) foreach(exe IN LISTS executables_no_common_c executables_with_common_c)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) set(exe_sources ${exe}.c $<TARGET_OBJECTS:mbedtls_test>)
if(NOT FUZZINGENGINE_LIB)
list(APPEND exe_sources onefile.c)
endif()
# This emulates "if ( ... IN_LIST ... )" which becomes available in CMake 3.3
list(FIND executables_with_common_c ${exe} exe_index)
if(${exe_index} GREATER -1)
list(APPEND exe_sources common.c)
endif()
add_executable(${exe} ${exe_sources})
if (NOT FUZZINGENGINE_LIB) if (NOT FUZZINGENGINE_LIB)
target_link_libraries(${exe} ${libs}) target_link_libraries(${exe} ${libs})
set_property(TARGET ${exe} APPEND PROPERTY SOURCES onefile.c)
else() else()
target_link_libraries(${exe} ${libs} FuzzingEngine) target_link_libraries(${exe} ${libs} FuzzingEngine)
SET_TARGET_PROPERTIES(${exe} PROPERTIES LINKER_LANGUAGE CXX) SET_TARGET_PROPERTIES(${exe} PROPERTIES LINKER_LANGUAGE CXX)
endif() endif()
# This emulates "if ( ... IN_LIST ... )" which becomes available in CMake 3.3
list(FIND executables_with_common_c ${exe} exe_index)
if (${exe_index} GREATER -1)
set_property(TARGET ${exe} APPEND PROPERTY SOURCES common.c)
endif()
endforeach() endforeach()

8
programs/ssl/CMakeLists.txt
View File

@ -27,7 +27,13 @@ set(executables
) )
foreach(exe IN LISTS executables) foreach(exe IN LISTS executables)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) set(extra_sources "")
if(exe STREQUAL "ssl_client2" OR exe STREQUAL "ssl_server2")
list(APPEND extra_sources
${CMAKE_CURRENT_SOURCE_DIR}/../test/query_config.c)
endif()
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>
${extra_sources})
target_link_libraries(${exe} ${libs}) target_link_libraries(${exe} ${libs})
target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include) target_include_directories(${exe} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../tests/include)
endforeach() endforeach()

11
programs/test/CMakeLists.txt
View File

@ -26,7 +26,13 @@ if(TEST_CPP)
endif() endif()
foreach(exe IN LISTS executables_libs executables_mbedcrypto) foreach(exe IN LISTS executables_libs executables_mbedcrypto)
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>) set(extra_sources "")
if(exe STREQUAL "query_compile_time_config")
list(APPEND extra_sources
${CMAKE_CURRENT_SOURCE_DIR}/query_config.c)
endif()
add_executable(${exe} ${exe}.c $<TARGET_OBJECTS:mbedtls_test>
${extra_sources})
# This emulates "if ( ... IN_LIST ... )" which becomes available in CMake 3.3 # This emulates "if ( ... IN_LIST ... )" which becomes available in CMake 3.3
list(FIND executables_libs ${exe} exe_index) list(FIND executables_libs ${exe} exe_index)
@ -37,9 +43,6 @@ foreach(exe IN LISTS executables_libs executables_mbedcrypto)
endif() endif()
endforeach() endforeach()
set_property(TARGET query_compile_time_config APPEND PROPERTY SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/query_config.c)
install(TARGETS ${executables_libs} ${executables_mbedcrypto} install(TARGETS ${executables_libs} ${executables_mbedcrypto}
DESTINATION "bin" DESTINATION "bin"
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)