Skip to content
This repository was archived by the owner on Apr 17, 2023. It is now read-only.

Commit 55f0eed

Browse files
committed
Modified platform library creation process during dependent linkage
1 parent d6ce2f7 commit 55f0eed

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

cmake/Platform/Targets/PlatformLibraryTarget.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,17 @@ endfunction()
2424

2525
#=============================================================================#
2626
# Creates a platform library target with the given name.
27+
# _target_name - Name of the target to link against.
2728
# _library_name - Name of the library target to create, usually the platform library name.
2829
#=============================================================================#
29-
function(_add_platform_library _library_name)
30+
function(_add_target_dependent_platform_library _target_name _library_name)
3031

3132
find_library_header_files("${ARDUINO_CMAKE_PLATFORM_LIBRARIES_PATH}/${_library_name}/src" lib_headers)
3233
find_library_source_files("${ARDUINO_CMAKE_PLATFORM_LIBRARIES_PATH}/${_library_name}/src" lib_source_files)
3334

3435
set(lib_sources ${lib_headers} ${lib_source_files})
3536

36-
_add_arduino_cmake_library(${_library_name} "${lib_sources}")
37+
_add_arduino_cmake_library("${_target_name}_${_library_name}" "${lib_sources}")
3738

3839
endfunction()
3940

@@ -53,9 +54,9 @@ function(link_platform_library _target_name _platform_library_name)
5354

5455
if (NOT TARGET ${_platform_library_name})
5556

56-
_add_platform_library(${_platform_library_name})
57+
_add_target_dependent_platform_library(${_target_name} ${_platform_library_name})
5758

58-
_link_arduino_cmake_library(${_target_name} ${_platform_library_name}
59+
_link_arduino_cmake_library(${_target_name} "${_target_name}_${_platform_library_name}"
5960
${scope}
6061
BOARD_CORE_TARGET ${${PROJECT_${ARDUINO_CMAKE_PROJECT_NAME}_BOARD}_CORELIB_TARGET})
6162

0 commit comments

Comments
 (0)