Include directories when setting up the library. Added Servo_RECURSE.

Author: francoiscampbell

cmake/Platform/Arduino.cmake

@@ -955,18 +955,15 @@ function(find_arduino_libraries VAR_NAME SRCS ARDLIBS)
                     foreach(LIB_SEARCH_PATH ${include_dirs} ${LIBRARY_SEARCH_PATH} ${ARDUINO_LIBRARIES_PATH} ${${ARDUINO_PLATFORM}_LIBRARIES_PATH} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libraries ${ARDUINO_EXTRA_LIBRARIES_PATH})
                         if(EXISTS ${LIB_SEARCH_PATH}/${INCLUDE_NAME}/${CMAKE_MATCH_1})
                             list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH}/${INCLUDE_NAME})
-                            include_directories(${LIB_SEARCH_PATH}/${INCLUDE_NAME})
                             break()
                         endif()
                         if(EXISTS ${LIB_SEARCH_PATH}/${INCLUDE_NAME}/src/${CMAKE_MATCH_1})
                             list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH}/${INCLUDE_NAME})
-                            include_directories(${LIB_SEARCH_PATH}/${INCLUDE_NAME}/src)
                             break()
                         endif()
                         get_source_file_property(_header_generated ${LIB_SEARCH_PATH}/${CMAKE_MATCH_1} GENERATED)
                         if((EXISTS ${LIB_SEARCH_PATH}/${CMAKE_MATCH_1}) OR ${_header_generated})
-                            list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH})
-                            include_directories(${LIB_SEARCH_PATH})
+                            list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH}/${INCLUDE_NAME})
                             break()
                         endif()
                     endforeach()
@@ -1002,6 +999,7 @@ endfunction()
 set(Wire_RECURSE True)
 set(Ethernet_RECURSE True)
 set(SD_RECURSE True)
+set(Servo_RECURSE True)
 set(SPI_RECURSE True)
 set(SoftwareSerial_RECURSE True)
 set(EEPROM_RECURSE True)
@@ -1028,6 +1026,9 @@ function(setup_arduino_library VAR_NAME BOARD_ID LIB_PATH COMPILE_FLAGS LINK_FLA
             message(STATUS "Generating ${TARGET_LIB_NAME} for library ${LIB_NAME}")
             arduino_debug_msg("Generating Arduino ${LIB_NAME} library")
             add_library(${TARGET_LIB_NAME} STATIC ${LIB_SRCS})
+            include_directories(${LIB_PATH})
+            include_directories(${LIB_PATH}/src)
+            include_directories(${LIB_PATH}/utility)
 
             get_arduino_flags(ARDUINO_COMPILE_FLAGS ARDUINO_LINK_FLAGS ${BOARD_ID} FALSE)