Mostly cosmetic changes - Renaming & Reordering

Author: MrPointer

cmake/Platform/Libraries/LibraryFlagsManager.cmake

@@ -20,6 +20,6 @@ function(set_library_flags _library_target)
     set_target_compile_flags(${_library_target} ${scope})
 
     # Set linker flags
-    set_linker_flags(${_library_target})
+    set_target_linker_flags(${_library_target})
 
 endfunction()

cmake/Platform/Other/TargetFlagsManager.cmake

@@ -55,7 +55,7 @@ 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.
 #=============================================================================#
-function(set_linker_flags _target_name)
+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)
@@ -82,7 +82,7 @@ endfunction()
 function(set_executable_target_flags _target_name)
 
     set_target_compile_flags(${_target_name})
-    set_linker_flags(${_target_name})
+    set_target_linker_flags(${_target_name})
 
     target_link_libraries(${_target_name} PUBLIC m) # Add math library
 

cmake/Platform/Targets/ArduinoLibraryTarget.cmake

@@ -73,7 +73,7 @@ function(link_arduino_library _target_name _library_target_name)
     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)
+    generate_core_lib_target_name(${board_id} core_lib_target)
 
     if (NOT TARGET ${core_lib_target})
         message(FATAL_ERROR "Core Library target doesn't exist. "

cmake/Platform/Targets/CoreLibTarget.cmake

@@ -5,6 +5,7 @@
 function(_is_board_core_valid _board_core _board_id)
 
     list(FIND ARDUINO_CMAKE_PLATFORM_CORES "${board_core}" index)
+
     if (${index} LESS 0)
         message(FATAL_ERROR "Unknown board core \"${board_core}\" for the ${_board_id} board")
     endif ()
@@ -18,6 +19,7 @@ endfunction()
 function(_is_board_variant_valid _board_variant _board_id)
 
     list(FIND ARDUINO_CMAKE_PLATFORM_VARIANTS "${board_variant}" index)
+
     if (${index} LESS 0)
         message(FATAL_ERROR "Unknown board variant \"${board_variant}\" for the ${_board_id} board")
     endif ()
@@ -64,23 +66,23 @@ endfunction()
 function(_set_core_lib_flags _core_target_name)
 
     set_target_compile_flags(${_core_target_name} PUBLIC)
-
-    set_linker_flags(${_core_target_name})
+    set_target_linker_flags(${_core_target_name})
 
 endfunction()
 
 #=============================================================================#
 # Adds/Creates a static library target for Arduino's core library (Core-Lib),
-# required by every standard Arduino Application/Executable.
-# The library is then linked against the given executable target
-# (Which also means is has to be created first).
+# required by every arduino target.
 #       _target_name - Name of the Application/Executable target created earlier.
 #       _board_id - Board to create the core library for.
 #                   Note that each board has a unique version of the library.
 #=============================================================================#
 function(add_arduino_core_lib _target_name)
 
-    get_core_lib_target_name(${board_id} core_lib_target)
+    # First, retrieve the board_id associated with the target from the matching property
+    get_target_property(board_id ${_target_name} BOARD_ID)
+
+    generate_core_lib_target_name(${board_id} core_lib_target)
 
     if (TARGET ${core_lib_target}) # Core-lib target already created for the given board
         if (TARGET ${_target_name}) # Executable/Firmware target also exists
@@ -89,16 +91,13 @@ function(add_arduino_core_lib _target_name)
 
     else () # Core-Lib target needs to be created
 
-        # First, retrieve the board_id associated with the target from the matching property
-        get_target_property(board_id ${_target_name} BOARD_ID)
-
         _get_board_core(${board_id} board_core) # Get board's core
         _get_board_variant(${board_id} board_variant) # Get board's variant
 
         # Find sources in core directory and add the library target
         find_source_files("${ARDUINO_CMAKE_CORE_${board_core}_PATH}" core_sources)
 
-        if (${CMAKE_HOST_UNIX})
+        if (CMAKE_HOST_UNIX)
             if (CMAKE_HOST_UBUNTU OR CMAKE_HOST_DEBIAN)
                 list(FILTER core_sources EXCLUDE REGEX "[Mm]ain\\.c.*")
             endif ()

cmake/Platform/Targets/PlatformLibraryTarget.cmake

@@ -58,7 +58,8 @@ function(link_platform_library _target_name _platform_library_name)
 
         _add_platform_library(${_platform_library_name} ${board_id})
 
-        get_core_lib_target_name(${board_id} core_lib_target)
+        generate_core_lib_target_name(${board_id} core_lib_target)
+
         _link_arduino_cmake_library(${_target_name} ${_platform_library_name}
                 ${scope}
                 BOARD_CORE_TARGET ${core_lib_target})

cmake/Platform/Utilities/StringUtils.cmake

@@ -59,7 +59,7 @@ endfunction()
 #       _return_var - Name of variable in parent-scope holding the return value.
 #       Returns - Name of the core library target for the given board.
 #=============================================================================#
-function(get_core_lib_target_name _board_id _return_var)
+function(generate_core_lib_target_name _board_id _return_var)
 
     string(REPLACE "." "_" board_id "${_board_id}")