diff options
| author | fuzzard <fuzzard@kodi.tv> | 2024-05-17 22:10:20 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2024-06-22 14:06:06 +1000 |
| commit | 35d29f02ed2ce7822cbfc84dbf3dfd6a496fac18 (patch) | |
| tree | f6f423c5287ca76bc874df3ec60a496520eab8f5 /cmake | |
| parent | 720666492bbd8a5f05653cfdb2f12faed19857e7 (diff) | |
[cmake][macros] update core_link_library to allow targets for data_arg
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/scripts/darwin_embedded/Macros.cmake | 8 | ||||
| -rw-r--r-- | cmake/scripts/freebsd/Macros.cmake | 8 | ||||
| -rw-r--r-- | cmake/scripts/linux/Macros.cmake | 8 | ||||
| -rw-r--r-- | cmake/scripts/osx/Macros.cmake | 8 |
4 files changed, 28 insertions, 4 deletions
diff --git a/cmake/scripts/darwin_embedded/Macros.cmake b/cmake/scripts/darwin_embedded/Macros.cmake index 5084bc1a54..f101044b11 100644 --- a/cmake/scripts/darwin_embedded/Macros.cmake +++ b/cmake/scripts/darwin_embedded/Macros.cmake @@ -37,7 +37,13 @@ function(core_link_library lib wraplib) list(APPEND export ${arg}) endforeach() elseif(check_arg STREQUAL archives) - set(extra_libs ${data_arg}) + foreach(_data_arg ${data_arg}) + if(TARGET ${_data_arg}) + list(APPEND extra_libs $<TARGET_FILE:_data_arg>) + else() + list(APPEND extra_libs ${_data_arg}) + endif() + endforeach() endif() get_filename_component(dir ${wraplib} DIRECTORY) diff --git a/cmake/scripts/freebsd/Macros.cmake b/cmake/scripts/freebsd/Macros.cmake index ef5aed38d1..f1877cf1e4 100644 --- a/cmake/scripts/freebsd/Macros.cmake +++ b/cmake/scripts/freebsd/Macros.cmake @@ -28,7 +28,13 @@ function(core_link_library lib wraplib) list(APPEND export ${arg}) endforeach() elseif(check_arg STREQUAL archives) - set(extra_libs ${data_arg}) + foreach(_data_arg ${data_arg}) + if(TARGET ${_data_arg}) + list(APPEND extra_libs $<TARGET_FILE:_data_arg>) + else() + list(APPEND extra_libs ${_data_arg}) + endif() + endforeach() endif() string(REGEX REPLACE "[ ]+" ";" _flags "${CMAKE_SHARED_LINKER_FLAGS}") diff --git a/cmake/scripts/linux/Macros.cmake b/cmake/scripts/linux/Macros.cmake index 37243a77cd..5ffb8171eb 100644 --- a/cmake/scripts/linux/Macros.cmake +++ b/cmake/scripts/linux/Macros.cmake @@ -28,7 +28,13 @@ function(core_link_library lib wraplib) list(APPEND export ${arg}) endforeach() elseif(check_arg STREQUAL archives) - set(extra_libs ${data_arg}) + foreach(_data_arg ${data_arg}) + if(TARGET ${_data_arg}) + list(APPEND extra_libs $<TARGET_FILE:_data_arg>) + else() + list(APPEND extra_libs ${_data_arg}) + endif() + endforeach() endif() string(REGEX REPLACE "[ ]+" ";" _flags "${CMAKE_SHARED_LINKER_FLAGS}") diff --git a/cmake/scripts/osx/Macros.cmake b/cmake/scripts/osx/Macros.cmake index f32a7358b5..6d41981db4 100644 --- a/cmake/scripts/osx/Macros.cmake +++ b/cmake/scripts/osx/Macros.cmake @@ -24,7 +24,13 @@ function(core_link_library lib wraplib) list(APPEND export ${arg}) endforeach() elseif(check_arg STREQUAL archives) - set(extra_libs ${data_arg}) + foreach(_data_arg ${data_arg}) + if(TARGET ${_data_arg}) + list(APPEND extra_libs $<TARGET_FILE:_data_arg>) + else() + list(APPEND extra_libs ${_data_arg}) + endif() + endforeach() endif() get_filename_component(dir ${wraplib} DIRECTORY) |