Added utility function to parse scope arguments of a function.

Updated code across all framework to use this function.

Author: MrPointer

cmake/Platform/Arduino.cmake

@@ -14,6 +14,7 @@ include(ListUtils)
 include(StringUtils)
 include(PropertyUtils)
 include(PlatformLibraryUtils)
+include(CMakeArgumentsUtils)
 
 include(BoardManager)
 include(RecipeParser)

cmake/Platform/Other/TargetFlagsManager.cmake

@@ -5,25 +5,24 @@
 #=============================================================================#
 function(set_compiler_target_flags _target_name _board_id)
 
-    set(option_args PRIVATE PUBLIC INTERFACE)
-    set(single_args LANGUAGE)
-    cmake_parse_arguments(compiler "${option_args}" "${single_args}" "" ${ARGN})
-
-    if (compiler_LANGUAGE)
-        if (compiler_PRIVATE)
-            set(scope PRIVATE)
-        elseif (compiler_INTERFACE)
-            set(scope INTERFACE)
-        else ()
-            set(scope PUBLIC)
-        endif ()
+    cmake_parse_arguments(parsed_args "" "LANGUAGE" "" ${ARGN})
+    parse_scope_argument("${ARGN}" scope
+            DEFAULT_SCOPE PUBLIC)
+
+    if (parsed_args_LANGUAGE)
+
         parse_compiler_recipe_flags("${_board_id}" compiler_recipe_flags
-                LANGUAGE "${compiler_LANGUAGE}")
+                LANGUAGE "${parsed_args_LANGUAGE}")
+
         target_compile_options(${_target_name} ${scope}
-                $<$<COMPILE_LANGUAGE:${compiler_LANGUAGE}>:${compiler_recipe_flags}>)
+                $<$<COMPILE_LANGUAGE:${parsed_args_LANGUAGE}>:${compiler_recipe_flags}>)
+
     else ()
+
         parse_compiler_recipe_flags("${_board_id}" compiler_recipe_flags)
-        target_compile_options(${_target_name} PUBLIC ${compiler_recipe_flags})
+
+        target_compile_options(${_target_name} ${scope} ${compiler_recipe_flags})
+
     endif ()
 
 endfunction()
@@ -36,7 +35,9 @@ endfunction()
 function(set_linker_flags _target_name _board_id)
 
     parse_linker_recpie_pattern("${_board_id}" linker_recipe_flags)
+
     string(REPLACE ";" " " cmake_compliant_linker_flags "${linker_recipe_flags}")
+
     set(CMAKE_EXE_LINKER_FLAGS "${cmake_compliant_linker_flags}" CACHE STRING "" FORCE)
 
 endfunction()

cmake/Platform/Targets/ArduinoCMakeLibraryTarget.cmake

@@ -47,21 +47,12 @@ function(_link_arduino_cmake_library _target_name _library_name)
         message(FATAL_ERROR "Target doesn't exist - It must be created first!")
     endif ()
 
-    set(scope_options "PRIVATE" "PUBLIC" "INTERFACE")
-    cmake_parse_arguments(link_library "${scope_options}" "BOARD_CORE_TARGET" "" ${ARGN})
-
-    # Now, link library to executable
-    if (link_library_PRIVATE)
-        set(scope PRIVATE)
-    elseif (link_library_INTERFACE)
-        set(scope INTERFACE)
-    else ()
-        set(scope PUBLIC)
-    endif ()
+    cmake_parse_arguments(parsed_args "" "BOARD_CORE_TARGET" "" ${ARGN})
+    parse_scope_argument("${ARGN}" scope)
 
     # Resolve Core-Lib's target
-    if (link_library_BOARD_CORE_TARGET)
-        set(core_target ${link_library_BOARD_CORE_TARGET})
+    if (parsed_args_BOARD_CORE_TARGET)
+        set(core_target ${parsed_args_BOARD_CORE_TARGET})
     else ()
         set(core_target ${${_target_name}_CORE_LIB_TARGET})
     endif ()
@@ -73,7 +64,7 @@ function(_link_arduino_cmake_library _target_name _library_name)
     target_link_libraries(${_library_name} ${scope} ${core_target})
 
     # Link library target to linked-to target
-    if (link_library_PRIVATE)
+    if (parsed_args_PRIVATE)
         target_link_libraries(${_target_name} PRIVATE ${_library_name})
     else ()
         # Link 'INTERFACE' targets publicly, otherwise code won't compile

cmake/Platform/Targets/PlatformLibraryTarget.cmake

@@ -17,6 +17,7 @@ function(find_dependent_platform_libraries _sources _return_var)
     endif ()
 
     get_platform_libraries_from_names("${included_headers_names}" dependent_libs)
+
     set(${_return_var} ${dependent_libs} PARENT_SCOPE)
 
 endfunction()
@@ -32,8 +33,7 @@ function(_add_platform_library _library_name _board_id)
     find_source_files("${ARDUINO_CMAKE_PLATFORM_LIBRARIES_PATH}/${_library_name}/src" lib_source_files)
     set(lib_sources ${lib_headers} ${lib_source_files})
 
-    _add_arduino_cmake_library(${_library_name} ${_board_id} "${lib_sources}"
-            ARCH ${ARDUINO_CMAKE_PLATFORM_ARCHITECTURE})
+    _add_arduino_cmake_library(${_library_name} ${_board_id} "${lib_sources}")
 
 endfunction()
 
@@ -49,14 +49,20 @@ function(link_platform_library _target_name _library_name _board_id)
         message(FATAL_ERROR "Target ${_target_name} doesn't exist - It must be created first!")
     endif ()
 
+    parse_scope_argument("${ARGN}" scope
+            DEFAULT_SCOPE PUBLIC)
+
     if (NOT TARGET ${_library_name})
+
         _add_platform_library(${_library_name} ${_board_id})
+
         get_core_lib_target_name(${_board_id} core_lib_target)
         _link_arduino_cmake_library(${_target_name} ${_library_name}
-                PUBLIC
+                ${scope}
                 BOARD_CORE_TARGET ${core_lib_target})
+
     else ()
-        target_link_libraries(${_target_name} PUBLIC ${_library_name})
+        target_link_libraries(${_target_name} ${scope} ${_library_name})
     endif ()
 
 endfunction()

cmake/Platform/Utilities/CMakeArgumentsUtils.cmake

@@ -0,0 +1,35 @@
+#=============================================================================#
+# Parses the given arguments for scope-controlling arguments, which are PUBLIC|INTERFACE|PRIVATE.
+# If none is found, CMake generates an error, unless - The DEFAULT_SCOPE argument is passed.
+#       _cmake_args - Arguments to parse. Usually function's unparsed arguments - ${ARGN}.
+#       [DEFAULT_SCOPE] - Optional default scope to return in case none is found in arguments.
+#       _return_var - Name of a CMake variable that will hold the extraction result.
+#       Returns - Parsed scope if one is found or the DEFAULT_SCOPE if set, otherwise an error.
+#=============================================================================#
+function(parse_scope_argument _cmake_args _return_var)
+
+    cmake_parse_arguments(parsed_args "" "DEFAULT_SCOPE" "" ${ARGN})
+
+    set(scope_options "PRIVATE" "PUBLIC" "INTERFACE")
+    cmake_parse_arguments(scope_args "${scope_options}" "" "" ${_cmake_args})
+
+    # Now, link library to executable
+    if (scope_args_PRIVATE)
+        set(scope PRIVATE)
+    elseif (scope_args_INTERFACE)
+        set(scope INTERFACE)
+    elseif (scope_args_PUBLIC)
+        set(scope PUBLIC)
+    else ()
+
+        if (parsed_args_DEFAULT_SCOPE) # Use default scope if none are given
+            set(scope ${parsed_args_DEFAULT_SCOPE})
+        else ()
+            message(SEND_ERROR "Can't parse scope arguments - None are given, or invalid!")
+        endif ()
+
+    endif ()
+
+    set(${_return_var} ${scope} PARENT_SCOPE)
+
+endfunction()