Refactored modules to use new 'BOARD_ID' target property.

Added check for target's type where interface libraries can be used to use the 'INTERFACE' prefix for the 'BOARD_ID' property in case the target is indeed an interface library.

Author: MrPointer

cmake/Platform/Libraries/LibraryFlagsManager.cmake

@@ -2,16 +2,24 @@
 # Sets compiler and linker flags on the given library target.
 # Changes are kept even outside the scope of the function since they apply on a target.
 #       _library_target - Name of the library target.
-#       _board_id - Board ID associated with the library. Some flags require it.
 #=============================================================================#
-function(set_library_flags _library_target _board_id)
+function(set_library_flags _library_target)
 
     parse_scope_argument(scope "${ARGN}"
             DEFAULT_SCOPE PUBLIC)
 
-    set_compiler_target_flags(${_library_target} ${_board_id} ${scope})
+    # Infer target's type and act differently if it's an interface-library
+    get_target_property(target_type ${_library_target} TYPE)
+
+    if ("${target_type}" STREQUAL "INTERFACE_LIBRARY")
+        get_target_property(board_id ${_library_target} INTERFACE_BOARD_ID)
+    else ()
+        get_target_property(board_id ${_library_target} BOARD_ID)
+    endif ()
+
+    set_target_compile_flags(${_library_target} ${scope})
 
     # Set linker flags
-    set_linker_flags(${_library_target} ${_board_id})
+    set_linker_flags(${_library_target})
 
 endfunction()

cmake/Platform/Other/TargetFlagsManager.cmake

@@ -1,13 +1,21 @@
 #=============================================================================#
 # Sets compiler flags on the given target using the given board ID, compiler language and scope.
 #       _target_name - Name of the target (Executable or Library) to set flags on.
-#       _board_id - Target's bounded board ID.
 #       _language - Language for which flags are set (such as C/C++).
 #       _scope - Flags' scope relative to outer targets (targets using the given target).
 #=============================================================================#
-function(_set_target_language_flags _target_name _board_id _language _scope)
+function(_set_target_language_flags _target_name _language _scope)
 
-    parse_compiler_recipe_flags(${_board_id} compiler_recipe_flags
+    # Infer target's type and act differently if it's an interface-library
+    get_target_property(target_type ${_target_name} TYPE)
+
+    if ("${target_type}" STREQUAL "INTERFACE_LIBRARY")
+        get_target_property(board_id ${_target_name} INTERFACE_BOARD_ID)
+    else ()
+        get_target_property(board_id ${_target_name} BOARD_ID)
+    endif ()
+
+    parse_compiler_recipe_flags(${board_id} compiler_recipe_flags
             LANGUAGE "${_language}")
 
     target_compile_options(${_target_name} ${_scope}
@@ -18,27 +26,26 @@ endfunction()
 #=============================================================================#
 # Sets compiler flags on the given target, according also to the given board ID.
 #       _target_name - Name of the target (Executable or Library) to set flags on.
-#       _board_id - Target's bounded board ID.
 #=============================================================================#
-function(set_compiler_target_flags _target_name _board_id)
+function(set_target_compile_flags _target_name)
 
     cmake_parse_arguments(parsed_args "" "LANGUAGE" "" ${ARGN})
     parse_scope_argument(scope "${ARGN}"
             DEFAULT_SCOPE PUBLIC)
 
     if (parsed_args_LANGUAGE)
-        _set_target_language_flags(${_target_name} ${_board_id} ${parsed_args_LANGUAGE} ${scope})
+        _set_target_language_flags(${_target_name} ${parsed_args_LANGUAGE} ${scope})
 
     else () # No specific language requested - Use all
 
         get_cmake_compliant_language_name(asm lang)
-        _set_target_language_flags(${_target_name} ${_board_id} ${lang} ${scope})
+        _set_target_language_flags(${_target_name} ${lang} ${scope})
 
         get_cmake_compliant_language_name(c lang)
-        _set_target_language_flags(${_target_name} ${_board_id} ${lang} ${scope})
+        _set_target_language_flags(${_target_name} ${lang} ${scope})
 
         get_cmake_compliant_language_name(cpp lang)
-        _set_target_language_flags(${_target_name} ${_board_id} ${lang} ${scope})
+        _set_target_language_flags(${_target_name} ${lang} ${scope})
 
     endif ()
 
@@ -47,11 +54,19 @@ endfunction()
 #=============================================================================#
 # Sets linker flags on the given target, according also to the given board ID.
 #       _target_name - Name of the target (Executable or Library) to set flags on.
-#       _board_id - Target's bounded board ID.
 #=============================================================================#
-function(set_linker_flags _target_name _board_id)
+function(set_linker_flags _target_name)
+
+    # Infer target's type and act differently if it's an interface-library
+    get_target_property(target_type ${_target_name} TYPE)
+
+    if ("${target_type}" STREQUAL "INTERFACE_LIBRARY")
+        get_target_property(board_id ${_target_name} INTERFACE_BOARD_ID)
+    else ()
+        get_target_property(board_id ${_target_name} BOARD_ID)
+    endif ()
 
-    parse_linker_recpie_pattern("${_board_id}" linker_recipe_flags)
+    parse_linker_recpie_pattern(${board_id} linker_recipe_flags)
 
     string(REPLACE ";" " " cmake_compliant_linker_flags "${linker_recipe_flags}")
 
@@ -63,12 +78,11 @@ endfunction()
 # Sets compiler and linker flags on the given Executable target,
 # according also to the given board ID.
 #       _target_name - Name of the target (Executable) to set flags on.
-#       _board_id - Target's bounded board ID.
 #=============================================================================#
-function(set_executable_target_flags _target_name _board_id)
+function(set_executable_target_flags _target_name)
 
-    set_compiler_target_flags(${_target_name} "${_board_id}")
-    set_linker_flags(${_target_name} "${_board_id}")
+    set_target_compile_flags(${_target_name})
+    set_linker_flags(${_target_name})
 
     target_link_libraries(${_target_name} PUBLIC m) # Add math library
 
@@ -80,14 +94,13 @@ endfunction()
 #=============================================================================#
 # Sets upload/flash flags on the given target, according also to the given board ID.
 #       _target_name - Name of the target (Executable) to set flags on.
-#       _board_id - Target's bounded board ID.
 #=============================================================================#
-function(set_upload_target_flags _target_name _board_id _upload_port _return_var)
+function(set_upload_target_flags _target_name _upload_port _return_var)
 
-    set(upload_flags "")
+    get_target_property(board_id ${_target_name} BOARD_ID)
 
     # Parse and append recipe flags
-    parse_upload_recipe_pattern("${_board_id}" "${_upload_port}" upload_recipe_flags)
+    parse_upload_recipe_pattern(${board_id} "${_upload_port}" upload_recipe_flags)
     list(APPEND upload_flags "${upload_recipe_flags}")
 
     set(target_binary_base_path "${CMAKE_CURRENT_BINARY_DIR}/${_target_name}")

cmake/Platform/Sketches/SketchHeadersManager.cmake

@@ -2,13 +2,14 @@
 # Resolves the header files included in a sketch by linking their appropriate library if necessary
 # or by validating they're included by the sketch target.
 #       _target_name - Name of the target to add the sketch file to.
-#       _board_id - ID of the board to bind to the target (Each target can have a single board).
 #       _sketch_file - Path to a sketch file to add to the target.
 #=============================================================================#
-function(resolve_sketch_headers _target_name _board_id _sketch_file)
+function(resolve_sketch_headers _target_name _sketch_file)
 
     get_source_file_included_headers("${_sketch_file}" sketch_headers)
 
+    get_target_property(board_id ${_target_name} BOARD_ID)
+
     foreach (header ${sketch_headers})
 
         # Header name without extension (such as '.h') can represent an Arduino/Platform library
@@ -21,12 +22,12 @@ function(resolve_sketch_headers _target_name _board_id _sketch_file)
 
             string(TOLOWER ${header_we} header_we_lower)
 
-            link_platform_library(${_target_name} ${header_we_lower} ${_board_id})
+            link_platform_library(${_target_name} ${header_we_lower})
 
         else ()
 
             # Pass the '3RD_PARTY' option to avoid name-conversion
-            find_arduino_library(${header_we}_sketch_lib ${header_we} ${_board_id} 3RD_PARTY QUIET)
+            find_arduino_library(${header_we}_sketch_lib ${header_we} ${board_id} 3RD_PARTY QUIET)
 
             # If library isn't found, display a status since it might be a user library
             if (NOT TARGET ${header_we}_sketch_lib OR
@@ -38,7 +39,7 @@ function(resolve_sketch_headers _target_name _board_id _sketch_file)
                         "you'd have to check this manually!")
 
             else ()
-                link_arduino_library(${_target_name} ${header_we}_sketch_lib ${_board_id})
+                link_arduino_library(${_target_name} ${header_we}_sketch_lib)
             endif ()
 
         endif ()

cmake/Platform/Sketches/SketchManager.cmake

@@ -24,18 +24,17 @@ endfunction()
 # Each sketch is converted to a valid '.cpp' source file under the project's source directory.
 # The function also finds and links any libraries the sketch uses to the target.
 #       _target_name - Name of the target to add the sketch file to.
-#       _board_id - ID of the board to bind to the target (Each target can have a single board).
 #       _sketch_file - Path to a sketch file to add to the target.
 #=============================================================================#
-function(add_sketch_to_target _target_name _board_id _sketch_file)
+function(add_sketch_to_target _target_name _sketch_file)
 
     _get_converted_source_desired_path(${_sketch_file} sketch_converted_source_path)
 
     # Only perform conversion if policy is set or if sketch hasn't been converted yet
     if (CONVERT_SKETCHES_IF_CONVERTED_SOURCES_EXISTS OR
             NOT EXISTS ${sketch_converted_source_path})
 
-        resolve_sketch_headers(${_target_name} ${_board_id} ${_sketch_file})
+        resolve_sketch_headers(${_target_name} ${_sketch_file})
 
         convert_sketch_to_source(${_sketch_file} ${sketch_converted_source_path})
 
@@ -48,15 +47,14 @@ endfunction()
 #=============================================================================#
 # Adds a list of sketch files as converted sources to the given target.
 #       _target_name - Name of the target to add the sketch file to.
-#       _board_id - ID of the board to bind to the target (Each target can have a single board).
 #       [Sketches] - List of paths to sketch files to add to the target.
 #=============================================================================#
-function(target_sketches _target_name _board_id)
+function(target_sketches _target_name)
 
     parse_sources_arguments(parsed_sketches "" "" "" "${ARGN}")
 
     foreach (sketch_file ${parsed_sketches})
-        add_sketch_to_target(${_target_name} ${_board_id} ${sketch_file})
+        add_sketch_to_target(${_target_name} ${sketch_file})
     endforeach ()
 
 endfunction()

cmake/Platform/Targets/ArduinoCMakeLibraryTarget.cmake

@@ -16,21 +16,27 @@ function(_add_arduino_cmake_library _target_name _board_id _sources)
 
         add_library(${_target_name} INTERFACE)
         set(scope INTERFACE)
-    
+
+        set_property(TARGET ${_target_name} PROPERTY INTERFACE_BOARD_ID ${_board_id})
+
     else ()
-    
-        add_library(${_target_name} STATIC "${_sources}")   
+
+        add_library(${_target_name} STATIC "${_sources}")
         set(scope PUBLIC)
-    
+
+        set_property(TARGET ${_target_name} PROPERTY BOARD_ID ${_board_id})
+
     endif ()
 
+
     # Treat headers' parent directories as include directories of the target
     get_headers_parent_directories("${_sources}" include_dirs)
     target_include_directories(${_target_name} ${scope} ${include_dirs})
 
-    set_library_flags(${_target_name} ${_board_id} ${scope})
+    set_library_flags(${_target_name} ${scope})
 
-    set_target_architecture_definition(${_target_name} ${scope} ${ARDUINO_CMAKE_PLATFORM_ARCHITECTURE})
+    set_target_architecture_definition(${_target_name} ${scope}
+            ${ARDUINO_CMAKE_PLATFORM_ARCHITECTURE})
 
 endfunction()
 

cmake/Platform/Targets/ArduinoExampleTarget.cmake

@@ -11,19 +11,21 @@
 function(add_arduino_example _target_name _board_id _example_name)
 
     convert_string_to_pascal_case(${_example_name} arduino_compliant_example_name)
+
     find_arduino_example_sources("${ARDUINO_SDK_EXAMPLES_PATH}"
             ${arduino_compliant_example_name} example_sketches ${ARGN})
+
     # First create the target (Without sources), then add sketches as converted sources
     add_arduino_executable(${_target_name} ${_board_id})
-    target_sketches(${_target_name} ${_board_id} "${example_sketches}")
+
+    target_sketches(${_target_name} "${example_sketches}")
 
 endfunction()
 
 #=============================================================================#
 # Adds/Creates an Arduino-Library-Example executable target with the given name,
 # using the given board ID and library example's sources.
 #       _target_name - Name of the target (Executable) to create.
-#       _board_id - ID of the board to bind to the target (Each target can have a single board).
 #       _library_target_name - Name of an already-existing library target.
 #                              This means the library should first be found by the user.
 #       _library_name - Name of the library the example belongs to, such as 'Servo'.
@@ -32,8 +34,7 @@ endfunction()
 #                        e.g The 'Blink' example is under the '01.Basics' category.
 #                        Generally, all this does is improving search performance by narrowing.
 #=============================================================================#
-function(add_arduino_library_example _target_name _board_id
-        _library_target_name _library_name _example_name)
+function(add_arduino_library_example _target_name _library_target_name _library_name _example_name)
 
     convert_string_to_pascal_case(${_example_name} arduino_compliant_example_name)
     convert_string_to_pascal_case(${_library_name} arduino_compliant_library_name)
@@ -42,10 +43,15 @@ function(add_arduino_library_example _target_name _board_id
         message(SEND_ERROR "Library target doesn't exist - It must be created first!")
     endif ()
 
+    get_target_property(board_id ${_library_target_name} BOARD_ID)
+
     find_arduino_library_example_sources("${ARDUINO_SDK_LIBRARIES_PATH}/${arduino_compliant_library_name}"
             ${arduino_compliant_example_name} example_sketches ${ARGN})
-    add_arduino_executable(${_target_name} ${_board_id})
-    target_sketches(${_target_name} ${_board_id} "${example_sketches}")
-    link_arduino_library(${_target_name} ${_library_target_name} ${_board_id})
+
+    add_arduino_executable(${_target_name} ${board_id})
+
+    target_sketches(${_target_name} "${example_sketches}")
+
+    link_arduino_library(${_target_name} ${_library_target_name})
 
 endfunction()

cmake/Platform/Targets/ArduinoLibraryTarget.cmake

@@ -34,7 +34,7 @@ function(add_arduino_library _target_name _board_id)
     find_dependent_platform_libraries("${arch_resolved_sources}" lib_platform_libs)
 
     foreach (platform_lib ${lib_platform_libs})
-        link_platform_library(${_target_name} ${platform_lib} ${_board_id})
+        link_platform_library(${_target_name} ${platform_lib})
     endforeach ()
 
 endfunction()
@@ -57,23 +57,30 @@ endfunction()
 # it adds core lib's include directories to the libraries include directories.
 #       _target_name - Name of the "executable" target.
 #       _library_target_name - Name of the library target.
-#       _board_id - Board ID associated with the linked Core Lib.
 #       [HEADER_ONLY] - Whether library is a header-only library, i.e has no source files
 #=============================================================================#
-function(link_arduino_library _target_name _library_target_name _board_id)
+function(link_arduino_library _target_name _library_target_name)
 
     cmake_parse_arguments(parsed_args "HEADER_ONLY" "" "" ${ARGN})
 
-    get_core_lib_target_name(${_board_id} core_lib_target)
-
     if (NOT TARGET ${_target_name})
         message(FATAL_ERROR "Target doesn't exist - It must be created first!")
     elseif (NOT TARGET ${_library_target_name})
         message(FATAL_ERROR "Library target doesn't exist - It must be created first!")
-    elseif (NOT TARGET ${core_lib_target})
-        message(FATAL_ERROR "Core Library target doesn't exist. This is bad and should be reported")
     endif ()
 
+    # Retrieve 'board_id' property of targets
+    get_target_property(board_id ${_target_name} BOARD_ID)
+
+    # Get the name of the Core-Lib target associated with the targets' 'board_id'
+    get_core_lib_target_name(${board_id} core_lib_target)
+
+    if (NOT TARGET ${core_lib_target})
+        message(FATAL_ERROR "Core Library target doesn't exist. "
+                "This is bad and should be reported")
+    endif ()
+
+    # Infer scope
     if (parsed_args_HEADER_ONLY)
         set(scope INTERFACE)
     else ()