Modified sketch target API to be more similar to CMake's targets API.

It's reflected mostly by the `target_sketches` function which adds sketches as converted source files to an already created target, just as CMake's `target_sources` does. The 'Example' modules that depend on the sketch API has been updated to use new API.
Also removed the `SketchTarget` module which allowed to create a target consisting of a single sketch files as this is not necessary anymore. The 'sketch' example has been updated accordingly.

Author: MrPointer

cmake/Platform/Arduino.cmake

@@ -26,6 +26,5 @@ include(ArduinoCMakeLibraryTarget)
 include(ArduinoLibraryTarget)
 include(PlatformLibraryTarget)
 include(ArduinoExampleTarget)
-include(SketchTarget)
 
 initialize_build_system()

cmake/Platform/Sketches/SketchHeadersManager.cmake

@@ -46,10 +46,10 @@ endfunction()
 # 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.
-#       _sketch_file - Path to a sketch file to add to the target.
 #       _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 _sketch_file _board_id)
+function(resolve_sketch_headers _target_name _board_id _sketch_file)
 
     _get_sketch_headers("${_sketch_file}" sketch_headers)
     foreach (header ${sketch_headers})

cmake/Platform/Sketches/SketchManager.cmake

@@ -22,37 +22,28 @@ 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.
-#       _sketch_file - Path to a sketch file to add to the target.
 #       _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 _sketch_file _board_id)
+function(add_sketch_to_target _target_name _board_id _sketch_file)
 
-    resolve_sketch_headers(${_target_name} "${_sketch_file}")
+    resolve_sketch_headers(${_target_name} ${_board_id} "${_sketch_file}")
     _get_converted_source_desired_path("${_sketch_file}" sketch_converted_source_path)
     convert_sketch_to_source("${_sketch_file}" "${sketch_converted_source_path}")
     target_sources(${_target_name} PRIVATE "${sketch_converted_source_path}")
 
 endfunction()
 
 #=============================================================================#
-# Converts all the given sketch file into valid 'cpp' source files and returns their paths.
-#        _sketch_files - List of paths to original sketch files.
-#        _return_var - Name of variable in parent-scope holding the return value.
-#        Returns - List of paths representing post-conversion sources.
+# 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).
+#       _sketch_files - List of paths to sketch files to add to the target.
 #=============================================================================#
-function(get_sources_from_sketches _sketch_files _return_var)
-
-    set(sources)
-    foreach (sketch ${_sketch_files})
-        get_filename_component(sketch_file_name "${sketch}" NAME_WE)
-        set(target_source_path "${CMAKE_CURRENT_SOURCE_DIR}/${sketch_file_name}.cpp")
-        # Only convert sketch if it hasn't been converted yet
-        if (NOT EXISTS "${target_source_path}")
-            convert_sketch_to_source("${sketch}" "${target_source_path}")
-        endif ()
-        list(APPEND sources "${target_source_path}")
-    endforeach ()
+function(target_sketches _target_name _board_id _sketch_files)
 
-    set(${_return_var} ${sources} PARENT_SCOPE)
+    foreach (sketch_file ${_sketch_files})
+        add_sketch_to_target(${_target_name} ${_board_id} "${sketch_file}")
+    endforeach ()
 
 endfunction()

cmake/Platform/Sketches/SketchSourceConverter.cmake

@@ -54,9 +54,9 @@ endfunction()
 # During the conversion process the platform's main header file is inserted to the source file
 # since it's critical for it to include it - Something that doesn't happen in "Standard" sketches.
 #        _sketch_file - Full path to the original sketch file (Read from).
-#        _target_file - Full path to the converted target source file (Written to).
+#        _converted_source_path - Full path to the converted target source file (Written to).
 #=============================================================================#
-function(convert_sketch_to_source _sketch_file _target_file)
+function(convert_sketch_to_source _sketch_file _converted_source_path)
 
     file(STRINGS "${_sketch_file}" sketch_loc)
     list(LENGTH sketch_loc num_of_loc)
@@ -91,6 +91,6 @@ function(convert_sketch_to_source _sketch_file _target_file)
         endif ()
     endforeach ()
 
-    _write_source_file("${refined_sketch}" "${target_source_path}")
+    _write_source_file("${refined_sketch}" "${_converted_source_path}")
 
 endfunction()

cmake/Platform/Targets/ArduinoExampleTarget.cmake

@@ -13,8 +13,9 @@ function(add_arduino_example _target_name _board_id _example_name)
 
     find_arduino_example_sources("${ARDUINO_SDK_EXAMPLES_PATH}"
             ${_example_name} example_sketches ${ARGN})
-    get_sources_from_sketches("${example_sketches}" example_sources)
-    add_arduino_executable(${_target_name} ${_board_id} ${example_sources})
+    # 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}")
 
 endfunction()
 
@@ -40,8 +41,8 @@ function(add_arduino_library_example _target_name _library_target_name _library_
 
     find_arduino_library_example_sources("${ARDUINO_SDK_LIBRARIES_PATH}/${_library_name}"
             ${_example_name} example_sketches ${ARGN})
-    get_sources_from_sketches("${example_sketches}" example_sources)
-    add_arduino_executable(${_target_name} ${_board_id} ${example_sources})
+    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})
 
 endfunction()

cmake/Platform/Targets/SketchTarget.cmake

@@ -3,4 +3,5 @@ cmake_minimum_required(VERSION 3.8)
 project(Sketch LANGUAGES C CXX ASM)
 get_board_id(board_id nano atmega328)
 
-add_sketch_target(Sketch ${board_id} sketch.ino)
+add_arduino_executable(Sketch ${board_id} "")
+target_sketches(Sketch ${board_id} sketch.ino)