Merge pull request #27 from arduino-cmake/feature/add-executable-fix

Fixed Executable API to handle unlimited list of sources

Author: MrPointer

cmake/Platform/Targets/ArduinoExampleTarget.cmake

@@ -14,7 +14,7 @@ function(add_arduino_example _target_name _board_id _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} "")
+    add_arduino_executable(${_target_name} ${_board_id})
     target_sketches(${_target_name} ${_board_id} "${example_sketches}")
 
 endfunction()
@@ -44,7 +44,7 @@ function(add_arduino_library_example _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} "")
+    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})
 

cmake/Platform/Targets/ExecutableTarget.cmake

@@ -3,12 +3,14 @@
 # using the given board ID and source files.
 #       _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).
-#       _src_files - List of source file (Could also be headers for code-inspection in some IDEs)
-#                    to create the executable from, just like it's done with a standard executable.
+#       [Sources] - List of source files (Could also be headers for code-inspection in some IDEs)
+#                   to create the executable from, similar to CMake's built-in add_executable.
 #=============================================================================#
-function(add_arduino_executable _target_name _board_id _src_files)
+function(add_arduino_executable _target_name _board_id)
 
-    add_executable(${_target_name} "${_src_files}")
+    list(APPEND sources "${ARGN}") # Treat all remaining arguments as sources
+
+    add_executable(${_target_name} "${sources}")
     # Always add board's core lib
     add_arduino_core_lib(${_target_name} "${_board_id}")
     # Add compiler and linker flags

examples/3rd-party-library/CMakeLists.txt

@@ -3,7 +3,8 @@ cmake_minimum_required(VERSION 3.8.2)
 project(3rd_Party_Arduino_Library)
 get_board_id(board_id nano atmega328)
 
-add_arduino_executable(3rd_Party_Arduino_Library ${board_id} testNeoPixel.cpp testGFX.cpp)
+add_arduino_executable(3rd_Party_Arduino_Library ${board_id} NeoPixelTest.cpp GFXTest.cpp)
+target_include_directories(3rd_Party_Arduino_Library PRIVATE include)
 
 add_arduino_library(Adafruit_NeoPixel ${board_id} libraries/Adafruit_NeoPixel/Adafruit_NeoPixel.cpp)
 target_include_directories(Adafruit_NeoPixel PUBLIC libraries/Adafruit_NeoPixel)

examples/3rd-party-library/GFXTest.cpp

@@ -0,0 +1,8 @@
+#include "include/GFXTest.h"
+
+static Adafruit_GFX_Button gfxButton;
+
+void doSomething()
+{
+    gfxButton.isPressed();
+}

examples/3rd-party-library/testNeoPixel.cpp renamed to examples/3rd-party-library/NeoPixelTest.cpp

@@ -1,10 +1,12 @@
 #include <Adafruit_NeoPixel.h>
+#include "GFXTest.h"
 
 Adafruit_NeoPixel neoPixel;
 
 void setup()
 {
     neoPixel.clear();
+    doSomething();
 }
 
 void loop()

examples/3rd-party-library/include/GFXTest.h

@@ -0,0 +1,8 @@
+#ifndef EXAMPLES_GFXTEST_HPP
+#define EXAMPLES_GFXTEST_HPP
+
+#include <Adafruit_GFX.h>
+
+void doSomething();
+
+#endif //EXAMPLES_GFXTEST_HPP

examples/3rd-party-library/testGFX.cpp

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