Added support for interface/header-only libraries through CMake's INTERFACE scope.

The feature isn't complete yet.

Author: MrPointer

cmake/Platform/Targets/ArduinoCMakeLibraryTarget.cmake

@@ -6,9 +6,20 @@
 #=============================================================================#
 function(_set_library_flags _library_target _board_id)
 
+    set(scope_options "PRIVATE" "PUBLIC" "INTERFACE")
+    cmake_parse_arguments(parsed_args "${scope_options}" "" "" ${ARGN})
+
+    if (parsed_args_PRIVATE)
+        set(scope PRIVATE)
+    elseif (parsed_args_INTERFACE)
+        set(scope INTERFACE)
+    else ()
+        set(scope PUBLIC)
+    endif ()
+
     # Set C++ compiler flags
     get_cmake_compliant_language_name(cpp flags_language)
-    set_compiler_target_flags(${_library_target} "${_board_id}" PUBLIC LANGUAGE ${flags_language})
+    set_compiler_target_flags(${_library_target} "${_board_id}" ${scope} LANGUAGE ${flags_language})
 
     # Set linker flags
     set_linker_flags(${_library_target} "${_board_id}")
@@ -22,13 +33,14 @@ endfunction()
 #       _target_name - Name of the library target to be created. Usually library's real name.
 #       _board_id - Board ID associated with the linked Core Lib.
 #       _sources - Source and header files to create library target from.
-#       [ARCH] - Optional library architecture (Such as 'avr', 'nrf52', etc.)
+#       [ARCH] - Optional library architecture (Such as 'avr', 'nrf52', etc.).
+#       [INTERFACE] - Whether the library should be created as an interface library (header-only).
 #=============================================================================#
 function(_add_arduino_cmake_library _target_name _board_id _sources)
 
-    cmake_parse_arguments(library "" "ARCH" "" ${ARGN})
+    cmake_parse_arguments(parsed_args "INTERFACE" "ARCH" "" ${ARGN})
 
-    if (library_ARCH) # Treat architecture-specific libraries differently
+    if (parsed_args_ARCH) # Treat architecture-specific libraries differently
         # Filter any sources that aren't supported by the platform's architecture
         list(LENGTH library_ARCH num_of_libs_archs)
         if (${num_of_libs_archs} GREATER 1)
@@ -42,17 +54,24 @@ function(_add_arduino_cmake_library _target_name _board_id _sources)
         list(FILTER _sources ${filter_type} REGEX ${arch_filter})
     endif ()
 
-    add_library(${_target_name} STATIC "${_sources}")
+    if (parsed_args_INTERFACE)
+        add_library(${_target_name} INTERFACE)
+        set(scope INTERFACE)
+    else ()
+        add_library(${_target_name} STATIC "${_sources}")
+        set(scope PUBLIC)
+    endif ()
+
     # Treat headers' parent directories as include directories of the target
     get_headers_parent_directories("${_sources}" include_dirs)
-    target_include_directories(${_target_name} PUBLIC ${include_dirs})
+    target_include_directories(${_target_name} ${scope} ${include_dirs})
 
-    _set_library_flags(${_target_name} ${_board_id})
+    _set_library_flags(${_target_name} ${_board_id} ${scope})
 
-    if (library_ARCH)
-        string(TOUPPER ${library_ARCH} upper_arch)
+    if (parsed_args_ARCH)
+        string(TOUPPER ${parsed_args_ARCH} upper_arch)
         set(arch_definition "ARDUINO_ARCH_${upper_arch}")
-        target_compile_definitions(${_target_name} PUBLIC ${arch_definition})
+        target_compile_definitions(${_target_name} ${scope} ${arch_definition})
     endif ()
 
 endfunction()

cmake/Platform/Targets/ArduinoLibraryTarget.cmake

@@ -69,6 +69,12 @@ function(_get_unsupported_architectures _arch_list _return_var)
 
 endfunction()
 
+function(add_arduino_header_only_library _target_name _board_id)
+
+    _add_arduino_cmake_library(${_target_name} ${_board_id} "${_sources}" INTERFACE "${ARGN}")
+
+endfunction()
+
 #=============================================================================#
 # Creates a library target for the given name and sources.
 # As it's an Arduino library, it also finds and links all dependent platform libraries (if any).
@@ -95,12 +101,14 @@ endfunction()
 #       _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 is a header-only library, i.e has no source files
 #=============================================================================#
 function(find_arduino_library _target_name _library_name _board_id)
 
-    cmake_parse_arguments(find_lib "3RD_PARTY" "" "" ${ARGN})
+    set(argument_options "3RD_PARTY" "HEADER_ONLY")
+    cmake_parse_arguments(parsed_args "${argument_options}" "" "" ${ARGN})
 
-    if (NOT find_lib_3RD_PARTY)
+    if (NOT parsed_args_3RD_PARTY)
         convert_string_to_pascal_case(${_library_name} _library_name)
     endif ()
 
@@ -130,13 +138,21 @@ function(find_arduino_library _target_name _library_name _board_id)
             set(error_message "Couldn't find any header files for the ${_library_name} library")
             message(SEND_ERROR "${error_message}")
         else ()
-            find_library_source_files("${library_path}" library_sources)
-            if (NOT library_sources)
-                set(error_message "Couldn't find any source files for the ${_library_name} library")
-                message(SEND_ERROR "${error_message}")
+            if (parsed_args_HEADER_ONLY)
+                add_arduino_header_only_library(${_target_name} ${_board_id} "${library_headers}"
+                        INTERFACE ARCH ${lib_arch})
             else ()
-                set(sources ${library_headers} ${library_sources})
-                add_arduino_library(${_target_name} ${_board_id} "${sources}" ARCH ${lib_arch})
+                find_library_source_files("${library_path}" library_sources)
+                if (NOT library_sources)
+                    string(CONCAT error_message
+                            "Couldn't find any source files for the ${_library_name} library - "
+                            "Is it a header-only library?\n"
+                            "If so, please pass the HEADER_ONLY option as an argument to the function")
+                    message(SEND_ERROR "${error_message}")
+                else ()
+                    set(sources ${library_headers} ${library_sources})
+                    add_arduino_library(${_target_name} ${_board_id} "${sources}" ARCH ${lib_arch})
+                endif ()
             endif ()
         endif ()
     endif ()

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

@@ -7,6 +7,7 @@ void setup()
 {
     testNeoPixel();
     testGFX();
+    testEnableInterrupt();
 }
 
 void loop()

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

@@ -21,9 +21,9 @@ find_arduino_library(Adafruit_GFX Adafruit-GFX-Library ${board_id} 3RD_PARTY)
 target_source_directories(Adafruit_GFX DIRS libraries/Adafruit-GFX-Library/Fonts)
 
 # Find the "EnableInterrupt" a header-only library
-#find_arduino_library(enableInterrupt EnableInterrupt ${board_id} 3RD_PARTY)
+find_arduino_library(EnableInterrupt EnableInterrupt ${board_id} 3RD_PARTY HEADER_ONLY)
 
 # Link all libraries to our previously created target
 link_arduino_library(3rd_Party_Arduino_Library Adafruit_NeoPixel ${board_id})
 link_arduino_library(3rd_Party_Arduino_Library Adafruit_GFX ${board_id})
-#link_arduino_library(3rd_Party_Arduino_Library enableInterrupt ${board_id})
+link_arduino_library(3rd_Party_Arduino_Library EnableInterrupt ${board_id})

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

@@ -1 +1,11 @@
 #include "include/InterruptTest.hpp"
+
+void handler_function()
+{
+    uint32_t interrupt_time = millis();
+}
+
+void testEnableInterrupt()
+{
+    enableInterrupt(BUTTON_PIN, handler_function, RISING);
+}

examples/3rd-party-library/include/InterruptTest.hpp

@@ -1,4 +1,10 @@
 #ifndef EXAMPLES_INTERRUPTTEST_HPP
 #define EXAMPLES_INTERRUPTTEST_HPP
 
+#include <EnableInterrupt.h>
+
+#define BUTTON_PIN 5
+
+void testEnableInterrupt();
+
 #endif //EXAMPLES_INTERRUPTTEST_HPP

examples/3rd-party-library/libraries/EnableInterrupt/EnableInterrupt.h

@@ -654,79 +654,6 @@ static volatile uint8_t portSnapshotB;
 #endif
 
 #ifndef NEEDFORSPEED
-#if defined BOBUINO_PINOUT
-#define ARDUINO_PIN_A0 21
-#define ARDUINO_PIN_A1 20
-#define ARDUINO_PIN_A2 19
-#define ARDUINO_PIN_A3 18
-#define ARDUINO_PIN_A4 17
-#define ARDUINO_PIN_A5 16
-#define ARDUINO_PIN_A6 15
-#define ARDUINO_PIN_A7 14
-#define ARDUINO_PIN_B0 4
-#define ARDUINO_PIN_B1 5
-#define ARDUINO_PIN_B2 6  // INT2
-#define ARDUINO_PIN_B3 7
-#define ARDUINO_PIN_B4 10
-#define ARDUINO_PIN_B5 11
-#define ARDUINO_PIN_B6 12
-#define ARDUINO_PIN_B7 13
-#define ARDUINO_PIN_C0 22
-#define ARDUINO_PIN_C1 23
-#define ARDUINO_PIN_C2 24
-#define ARDUINO_PIN_C3 25
-#define ARDUINO_PIN_C4 26
-#define ARDUINO_PIN_C5 27
-#define ARDUINO_PIN_C6 28
-#define ARDUINO_PIN_C7 29
-#define ARDUINO_PIN_D0 0
-#define ARDUINO_PIN_D1 1
-#define ARDUINO_PIN_D2 2  // INT0
-#define ARDUINO_PIN_D3 3  // INT1
-#define ARDUINO_PIN_D4 30
-#define ARDUINO_PIN_D5 8
-#define ARDUINO_PIN_D6 9
-#define ARDUINO_PIN_D7 31
-
-const uint8_t PROGMEM digital_pin_to_port_bit_number_PGM[] = {
-  0, // PD0
-  1, // PD1
-  2, // PD2
-  3, // PD3
-  0, // PB0
-  1, // PB1
-  2, // PB2
-  3, // PB3
-  5, // PD5
-  6, // PD6
-
-  4, // PB4
-  5, // PB5
-  6, // PB6
-  7, // PB7
-  7, // PA7
-  6, // PA6
-  5, // PA5
-  4, // PA4
-  3, // PA3
-  2, // PA2
-
-  1, // PA1
-  0, // PA0
-  0, // PC0
-  1, // PC1
-  2, // PC2
-  3, // PC3
-  4, // PC4
-  5, // PC5
-  6, // PC6
-  7, // PC7
-
-  4, // PD4
-  7, // PD7
-};
-
-#else
 #define ARDUINO_PIN_A0 24
 #define ARDUINO_PIN_A1 25
 #define ARDUINO_PIN_A2 26
@@ -816,7 +743,6 @@ const uint8_t PROGMEM digital_pin_to_port_bit_number_PGM[] = {
   6,
   7
 };
-#endif
 
 
 #if ! defined(EI_NOTEXTERNAL) && ! defined(EI_NOTINT0) && ! defined(EI_NOTINT1) && ! defined(EI_NOTINT2)

examples/3rd-party-library/libraries/EnableInterrupt/README.md

@@ -6,8 +6,12 @@ Functions:
 enableInterrupt- Enables interrupt on a selected Arduino pin.
 disableInterrupt - Disables interrupt on the selected Arduino pin.
 
-
-*_What's New?_ Fri Jun 22 06:49:57 CDT 2018 Version 1.0.0 of the library has been released. Alex Reinert contributed Bobuino support. Thanks, Alex! And at this point, I think it's long past due that we stick a non-beta sticker on this thing. Congratulations, EnableInterrupt- you are all grown up. Version 1.0.0 it is.
+*_What's New?_ Tue Sep 19 18:02:21 CDT 2017 Version 0.9.8 of the library has been released.
+There were a number of outstanding pull requests that were merged into the library. Thanks
+to Loranzo Cafaro for his switch debounce example, to Jevon Wild for his changes to make the
+library more functional with PlatformIO (http://docs.platformio.org/en/latest/what-is-platformio.html),
+Ricardo JL Rufino for some PlatformIO fixes to the library.json file, and Sara Damiano for
+adding support for the Sodaq Mbili and EnviroDIY Mayfly.
 
 The EnableInterrupt library is an Arduino interrupt library, designed for
 all versions of the Arduino- at this writing, the Uno (and other ATmega328p-based
@@ -293,7 +297,7 @@ the library's code and thus is not supported by this library.  It is the same
 pin the Arduino uses to upload sketches, and it is connected to the FT232RL
 USB-to-Serial chip (ATmega16U2 on the R3).
 
-### Mighty 1284, Bobuino, EnviroDIY Mayfly, Sodaq Mbili Support
+### Mighty 1284, EnviroDIY Mayfly, Sodaq Mbili Support
 The ATmega 1284p shares pinout with the 644; the only difference is in memory
 size. We use the "Mighty 1284" platform as our model, because the needed files are
 mature and complete.
@@ -320,26 +324,6 @@ Pin     Interrupt               Pin*  PORT PCINT ATmega644/1284 pin    Pin*  POR
                                                                     25/A1    PA1   1        39
                                                                     24/A0    PA0   0        40
 
-Bobuino External                Bobuino                                Bobuino           
-Pin     Interrupt               Pin*  PORT PCINT ATmega644/1284 pin    Pin*  PORT PCINT ATmega644/1284 pin
-                Port            4     PB0   8         1                31    PD7  31        21
-2       INT2    PB2             5     PB1   9         2                22    PC0  16        22
-10      INT1    PD2             6     PB2   2         3                23    PC1  17        23
-11      INT0    PD3             7     PB3  11         4                24    PC2  18        24
-                               10     PB4  12         5                25    PC3  19        25
-                               11     PB5  13         6                26    PC4  20        26
-                               12     PB6  14         7                27    PC5  21        27
-                               13     PB7  15         8                28    PC6  22        28
-                                0     PD0  24        14                29    PC7  23        29
-                                1     PD1  25        15             14/A0    PA7   7        33
-                                2     PD2  26        16             15/A1    PA6   6        34
-                                3     PD3  27        17             16/A2    PA5   5        35
-                               30     PD4  28        18             17/A3    PA4   4        36
-                                8     PD5  29        19             18/A4    PA3   3        37
-                                9     PD6  30        20             19/A5    PA2   2        38
-                                                                    20/A6    PA1   1        39
-                                                                    21/A7    PA0   0        40
-
 Mayfly                          Mayfly                                 Mayfly
 Mbili   External                Mbili                                  Mbili           
 Pin     Interrupt               Pin*  PORT PCINT ATmega644/1284 pin    Pin*  PORT PCINT ATmega644/1284 pin

examples/3rd-party-library/libraries/EnableInterrupt/ReleaseChecklist

@@ -0,0 +1,23 @@
+- examples/test.sh compiles
+- #pragma message in .h file up-to-date?
+- Use Arduino IDE, compile "SimpleDueZero"
+- Tests:
+	- Simple
+	- HiSpeed
+	- HiSpeedAllPins328
+	- AllPins328
+	- HiSpeedAllPins2560
+	- AllPins2560
+	- ATtinyBlink
+- README.md up-to-date?
+- extras/RELEASE_NOTES consistent with README.md?
+- library.properties current?
+- library.json current?
+- Git Tagged?  git tag -a 2.31 -m 'my version 1.4'; git push origin 2.31 OR git push origin --tags
+- Zip file created?  ~/bin/zipei 0.9.0
+- BinTray:
+	- Upload Zip file
+	- Update the downloads area
+- Git commit
+- Push files to GitHub
+- Post to Arduino forums