Merge branch 'feature/3rd-party-arduino-libs' into feature/sketchbook

Author: MrPointer

cmake/Platform/Sources/SourcesManager.cmake

@@ -64,7 +64,9 @@ function(get_headers_parent_directories _sources _return_var)
         get_filename_component(header_parent_dir ${header_source} DIRECTORY)
         list(APPEND parent_dirs ${header_parent_dir})
     endforeach ()
-    list(REMOVE_DUPLICATES parent_dirs)
+    if (parent_dirs) # Check parent dirs, could be none if there aren't any headers amongst sources
+        list(REMOVE_DUPLICATES parent_dirs)
+    endif ()
 
     set(${_return_var} ${parent_dirs} PARENT_SCOPE)
 

cmake/Platform/Targets/ArduinoLibraryTarget.cmake

@@ -76,7 +76,7 @@ endfunction()
 #       _board_id - Board ID associated with the linked Core Lib.
 #       _sources - Source and header files to create target from.
 #=============================================================================#
-function(_add_arduino_library _target_name _board_id _sources)
+function(add_arduino_library _target_name _board_id _sources)
 
     _add_arduino_cmake_library(${_target_name} ${_board_id} "${_sources}" "${ARGN}")
     find_dependent_platform_libraries("${_sources}" lib_platform_libs)
@@ -97,18 +97,22 @@ endfunction()
 #=============================================================================#
 function(find_arduino_library _target_name _library_name _board_id)
 
-    convert_string_to_pascal_case(${_library_name} arduino_compliant_library_name)
-    set(library_path "${ARDUINO_SDK_LIBRARIES_PATH}/${arduino_compliant_library_name}")
+    cmake_parse_arguments(find_lib "3RD_PARTY" "" "" ${ARGN})
+
+    if (NOT find_lib_3RD_PARTY)
+        convert_string_to_pascal_case(${_library_name} _library_name)
+    endif ()
+    set(library_path "${ARDUINO_SDK_LIBRARIES_PATH}/${_library_name}")
     set(library_properties_path "${library_path}/library.properties")
 
     if (NOT EXISTS "${library_properties_path}")
-        message(SEND_ERROR "Couldn't find library named ${arduino_compliant_library_name}")
+        message(SEND_ERROR "Couldn't find library named ${_library_name}")
     else () # Library is found
         _get_library_architecture("${library_properties_path}" lib_arch)
         if (lib_arch)
             if ("${lib_arch}" MATCHES "UNSUPPORTED")
                 string(CONCAT error_message
-                        "${arduino_compliant_library_name} "
+                        "${_library_name} "
                         "library isn't supported on the platform's architecture "
                         "${ARDUINO_CMAKE_PLATFORM_ARCHITECTURE}")
                 message(SEND_ERROR ${error_message})
@@ -126,12 +130,12 @@ function(find_arduino_library _target_name _library_name _board_id)
 
             if (NOT library_sources)
                 set(error_message
-                        "${arduino_compliant_library_name} doesn't have any source files \
+                        "${_library_name} doesn't have any source files \
                          under the 'src' directory")
                 message(SEND_ERROR "${error_message}")
             else ()
                 set(sources ${library_headers} ${library_sources})
-                _add_arduino_library(${_target_name} ${_board_id} "${sources}" ARCH ${lib_arch})
+                add_arduino_library(${_target_name} ${_board_id} "${sources}" ARCH ${lib_arch})
             endif ()
         endif ()
     endif ()

examples/CMakeLists.txt

@@ -4,6 +4,7 @@ project(Examples LANGUAGES C CXX ASM)
 
 add_subdirectory(hello-world)
 add_subdirectory(arduino-library)
+add_subdirectory(custom-library)
 add_subdirectory(blink-example)
 add_subdirectory(servo-knob-example)
 add_subdirectory(sketch)