Refactored the 'ArduinoCMakeLibraryTarget' module.

Separated target architecture definition to a function under the 'TargetFlagsManager' module.

Author: MrPointer

cmake/Platform/Other/TargetFlagsManager.cmake

@@ -81,3 +81,18 @@ function(set_upload_target_flags _target_name _board_id _upload_port _return_var
 
 endfunction()
 
+#=============================================================================#
+# Adds a compiler definition (#define) for the given architecture to the target.
+# The affecting scope of the definition is controlled by the _scope argument.
+#       _target - Name of the target (Executable) to set flags on.
+#       _scope - PUBLIC|INTERFACE|PRIVATE. Affects outer scope - How other targets see it.
+#       _architecture - Architecture to define, e.g. 'avr'
+#=============================================================================#
+function(set_target_architecture_definition _target _scope _architecture)
+
+    string(TOUPPER ${_architecture} upper_arch)
+    set(arch_definition "ARDUINO_ARCH_${upper_arch}")
+
+    target_compile_definitions(${_target} ${_scope} ${arch_definition})
+
+endfunction()

cmake/Platform/Targets/ArduinoCMakeLibraryTarget.cmake

@@ -26,9 +26,8 @@ function(_add_arduino_cmake_library _target_name _board_id _sources)
 
     set_library_flags(${_target_name} ${_board_id} ${scope})
 
-    string(TOUPPER ${ARDUINO_CMAKE_PLATFORM_ARCHITECTURE} upper_arch)
-    set(arch_definition "ARDUINO_ARCH_${upper_arch}")
-    target_compile_definitions(${_target_name} ${scope} ${arch_definition})
+    set_target_architecture_definition(${_target_name} ${scope}
+            ${ARDUINO_CMAKE_PLATFORM_ARCHITECTURE})
 
 endfunction()
 
@@ -38,7 +37,7 @@ endfunction()
 # then links it to the library.
 #       _target_name - Name of the target to link against.
 #       _library_name - Name of the library target to link.
-#       [PRIVATE|PUBLIC|INTERFACE] - Optional link scope.
+#       [PRIVATE|PUBLIC|INTERFACE] - Optional link scope for the internally linked Core-Lib.
 #       [BOARD_CORE_TARGET] - Optional target name of the Core Lib to use.
 #                             Use when the target is a library.
 #=============================================================================#
@@ -52,25 +51,33 @@ function(_link_arduino_cmake_library _target_name _library_name)
     cmake_parse_arguments(link_library "${scope_options}" "BOARD_CORE_TARGET" "" ${ARGN})
 
     # Now, link library to executable
-    if (link_library_PUBLIC)
-        set(scope PUBLIC)
+    if (link_library_PRIVATE)
+        set(scope PRIVATE)
     elseif (link_library_INTERFACE)
         set(scope INTERFACE)
     else ()
-        set(scope PRIVATE)
+        set(scope PUBLIC)
     endif ()
 
-    # First, include core lib's directories in library as well
+    # Resolve Core-Lib's target
     if (link_library_BOARD_CORE_TARGET)
         set(core_target ${link_library_BOARD_CORE_TARGET})
     else ()
         set(core_target ${${_target_name}_CORE_LIB_TARGET})
     endif ()
 
     get_target_property(core_lib_includes ${core_target} INCLUDE_DIRECTORIES)
+
+    # Include core lib's include directories in library target, then link to it
     target_include_directories(${_library_name} ${scope} "${core_lib_includes}")
     target_link_libraries(${_library_name} ${scope} ${core_target})
 
-    target_link_libraries(${_target_name} PRIVATE ${_library_name})
+    # Link library target to linked-to target
+    if (link_library_PRIVATE)
+        target_link_libraries(${_target_name} PRIVATE ${_library_name})
+    else ()
+        # Link 'INTERFACE' targets publicly, otherwise code won't compile
+        target_link_libraries(${_target_name} PUBLIC ${_library_name})
+    endif ()
 
 endfunction()

cmake/Platform/Targets/ArduinoLibraryTarget.cmake

@@ -56,13 +56,13 @@ function(link_arduino_library _target_name _library_target_name _board_id)
     endif ()
 
     if (parsed_args_HEADER_ONLY)
-        _link_arduino_cmake_library(${_target_name} ${_library_target_name}
-                INTERFACE
-                BOARD_CORE_TARGET ${core_lib_target})
+        set(scope INTERFACE)
     else ()
-        _link_arduino_cmake_library(${_target_name} ${_library_target_name}
-                PUBLIC
-                BOARD_CORE_TARGET ${core_lib_target})
+        set(scope PUBLIC)
     endif ()
 
+    _link_arduino_cmake_library(${_target_name} ${_library_target_name}
+            ${scope}
+            BOARD_CORE_TARGET ${core_lib_target})
+
 endfunction()