Further refactored towards a project-global board_id

It omits the need to pass it as an argument to functions or to set it as a target property.

Author: MrPointer

cmake/Platform/Arduino.cmake

@@ -4,6 +4,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Utilities)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Hardware/Boards)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/System)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Other)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Project)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Properties)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Sketches)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Sources)
@@ -34,4 +35,6 @@ include(ArduinoLibraryTarget)
 include(PlatformLibraryTarget)
 include(ArduinoExampleTarget)
 
+include(Project)
+
 initialize_build_system()

cmake/Platform/Hardware/Boards/BoardConfigurator.cmake

@@ -1,2 +1 @@
 include(BoardManager)
-include(BoardConfigurator)

cmake/Platform/Hardware/Boards/Boards.cmake

@@ -11,13 +11,12 @@ endmacro()
 # using the current platform architecture.
 #       _target_name - Name of the library target to be created. Usually library's real name.
 #       _library_name - Name of the Arduino library to find.
-#       _board_id - Board ID associated with the linked Core Lib.
 #       [3RD_PARTY] - Whether library should be treated as a 3rd Party library.
 #       [HEADER_ONLY] - Whether library should be treated as header-only library.
 #       [QUIET] - Whether function should "fail" safely without warnings/errors
 #                 in case of an actual error.
 #=============================================================================#
-function(find_arduino_library _target_name _library_name _board_id)
+function(find_arduino_library _target_name _library_name)
 
     set(argument_options "3RD_PARTY" "HEADER_ONLY" "QUIET")
     cmake_parse_arguments(parsed_args "${argument_options}" "" "" ${ARGN})
@@ -53,7 +52,7 @@ function(find_arduino_library _target_name _library_name _board_id)
         else ()
 
             if (parsed_args_HEADER_ONLY)
-                add_arduino_header_only_library(${_target_name} ${_board_id} ${library_headers})
+                add_arduino_header_only_library(${_target_name} ${library_headers})
 
             else ()
 
@@ -74,7 +73,7 @@ function(find_arduino_library _target_name _library_name _board_id)
 
                     set(sources ${library_headers} ${library_sources})
 
-                    add_arduino_library(${_target_name} ${_board_id} ${sources})
+                    add_arduino_library(${_target_name} ${sources})
 
                 endif ()
 

cmake/Platform/Libraries/LibrariesFinder.cmake

@@ -11,12 +11,6 @@ function(set_library_flags _library_target)
     # 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

cmake/Platform/Libraries/LibraryFlagsManager.cmake

@@ -9,17 +9,9 @@ function(_set_target_language_flags _target_name _language _scope)
     # 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}")
+    parse_compiler_recipe_flags(${ARDUINO_CMAKE_PROJECT_BOARD} compiler_recipe_flags LANGUAGE "${_language}")
 
-    target_compile_options(${_target_name} ${_scope}
-            $<$<COMPILE_LANGUAGE:${_language}>:${compiler_recipe_flags}>)
+    target_compile_options(${_target_name} ${_scope} $<$<COMPILE_LANGUAGE:${_language}>:${compiler_recipe_flags}>)
 
 endfunction()
 
@@ -60,13 +52,7 @@ function(set_target_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(${ARDUINO_CMAKE_PROJECT_BOARD} linker_recipe_flags)
 
     string(REPLACE ";" " " cmake_compliant_linker_flags "${linker_recipe_flags}")
 
@@ -97,10 +83,8 @@ endfunction()
 #=============================================================================#
 function(set_upload_target_flags _target_name _upload_port _return_var)
 
-    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(${ARDUINO_CMAKE_PROJECT_BOARD} "${_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/Other/TargetFlagsManager.cmake

@@ -0,0 +1,15 @@
+function(setup_project_board)
+
+    cmake_parse_arguments(parsed_args "" "BOARD_NAME;BOARD_CPU" "" ${ARGV})
+
+    if (NOT parsed_args_BOARD_NAME)
+        message(FATAL_ERROR "Expected board name in setup function")
+    else ()
+
+        get_board_id(board_id ${parsed_args_BOARD_NAME} ${parsed_args_BOARD_CPU})
+
+        set(ARDUINO_CMAKE_PROJECT_BOARD ${board_id} CACHE STRING "Project-Wide board ID")
+
+    endif ()
+
+endfunction()

cmake/Platform/Project/BoardSetup.cmake

@@ -0,0 +1,2 @@
+include(BoardSetup)
+include(Setup)

cmake/Platform/Project/Project.cmake

@@ -0,0 +1,9 @@
+function(arduino_cmake_project _project_name)
+
+    project(${_project_name})
+
+    set(ARDUINO_CMAKE_PROJECT_NAME ${_project_name} CACHE STRING "Current project name")
+
+    setup_project_board(${ARGN})
+
+endfunction()

cmake/Platform/Project/Setup.cmake

@@ -8,8 +8,6 @@ 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
@@ -27,7 +25,7 @@ function(resolve_sketch_headers _target_name _sketch_file)
         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} 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