Fixed bug where custom Arduino-SDK paths weren't actually honored.

Also fixed minor bug where SDK's version hasn't been displayed.
Modified 'AppVeyor' config to setup environment correctly.

Author: MrPointer

appveyor.yml

@@ -1,11 +1,14 @@
 version: '{build}'
 image: Visual Studio 2017
+notifications:
+- provider: Email
+  on_build_success: false
 environment:
   matrix:
-  - ARDUINO_SDK_VERSION: 1.6.0
-  - ARDUINO_SDK_VERSION: 1.8.5
+  - ARDUINO_SDK_VERSION: 1.6.13
+  - ARDUINO_SDK_VERSION: 1.8.6
 install:
-- ps: cinst unzip
+- ps: cinst make unzip
 - ps: $env:ARDUINO_SDK_FILE = "arduino-$env:ARDUINO_SDK_VERSION-windows.zip"
 - ps: $env:ARDUINO_SDK_URI = "https://downloads.arduino.cc/$env:ARDUINO_SDK_FILE"
 - ps: wget "$env:ARDUINO_SDK_URI" -O "$env:ARDUINO_SDK_FILE"
@@ -17,7 +20,12 @@ build_script:
 - ps: mkdir build
 - ps: cd build
 - ps: echo "$env:ARDUINO_SDK_PATH"
-- ps: cmake -G "Unix Makefiles" -D ARDUINO_SDK_PATH="$env:ARDUINO_SDK_PATH" -D CMAKE_TOOLCHAIN_FILE="../cmake/Arduino-Toolchain.cmake" ..
+- ps: >-
+    cmake -G "Unix Makefiles"
+    -DCMAKE_TOOLCHAIN_FILE="..\cmake\Arduino-Toolchain.cmake"
+    -DARDUINO_SDK_PATH="$env:ARDUINO_SDK_PATH"
+    -DCMAKE_SH="CMAKE_SH-NOTFOUND"
+    ..\examples
 - ps: make
 after_build:
 - 7z a arduino-cmake-ng.zip %APPVEYOR_BUILD_FOLDER%\cmake

cmake/Arduino-Toolchain.cmake

@@ -31,13 +31,13 @@ endfunction()
 
 function(_setup_sdk_internal_paths)
 
-    set(ARDUINO_SDK_BIN_PATH "${ARDUINO_SDK_PATH}/hardware/tools/avr/bin" CACHE PATH
+    set(ARDUINO_SDK_BIN_PATH "${ARDUINO_CMAKE_SDK_PATH}/hardware/tools/avr/bin" CACHE PATH
             "Path to Arduino SDK's binaries folder")
-    set(ARDUINO_SDK_ROOT_PATH "${ARDUINO_SDK_PATH}/hardware/tools/avr" CACHE PATH
+    set(ARDUINO_SDK_ROOT_PATH "${ARDUINO_CMAKE_SDK_PATH}/hardware/tools/avr" CACHE PATH
             "Path to Arduino SDK's sys-root folder")
-    set(ARDUINO_SDK_LIBRARIES_PATH "${ARDUINO_SDK_PATH}/libraries" CACHE PATH
+    set(ARDUINO_SDK_LIBRARIES_PATH "${ARDUINO_CMAKE_SDK_PATH}/libraries" CACHE PATH
             "Path to SDK's libraries directory")
-    set(ARDUINO_SDK_EXAMPLES_PATH "${ARDUINO_SDK_PATH}/examples" CACHE PATH
+    set(ARDUINO_SDK_EXAMPLES_PATH "${ARDUINO_CMAKE_SDK_PATH}/examples" CACHE PATH
             "Path to SDK's examples directory")
 
 endfunction()
@@ -53,9 +53,13 @@ set(ARDUINO_CMAKE_TOOLCHAIN_DIR ${CMAKE_CURRENT_LIST_DIR} CACHE PATH
         "Path to Arduino-CMake's toolchain directory")
 
 # Set default path if none is set
-if (NOT ARDUINO_SDK_PATH)
-    find_arduino_sdk(arduino_sdk_path)
-    set(ARDUINO_SDK_PATH "${arduino_sdk_path}" CACHE PATH "Arduino SDK Path")
+if (ARDUINO_SDK_PATH)
+    set(ARDUINO_CMAKE_SDK_PATH "${ARDUINO_SDK_PATH}" CACHE PATH "Arduino SDK Path")
+else ()
+    if (NOT DEFINED ARDUINO_CMAKE_SDK_PATH) # Custom path has already been set
+        find_arduino_sdk(arduino_sdk_path)
+        set(ARDUINO_CMAKE_SDK_PATH "${arduino_sdk_path}" CACHE PATH "Arduino SDK Path")
+    endif ()
 endif ()
 
 _setup_sdk_internal_paths()

cmake/Platform/System/PlatformInitializer.cmake

@@ -43,7 +43,7 @@ function(initialize_arduino_platform)
                 set(ARDUINO_CMAKE_PLATFORM_NAME "arduino" CACHE STRING "")
             endif ()
             set(ARDUINO_CMAKE_PLATFORM_ARCHITECTURE "avr" CACHE STRING "")
-            string(CONCAT platform_path "${ARDUINO_SDK_PATH}"
+            string(CONCAT platform_path "${ARDUINO_CMAKE_SDK_PATH}"
                     /hardware/
                     "${ARDUINO_CMAKE_PLATFORM_NAME}/"
                     "${ARDUINO_CMAKE_PLATFORM_ARCHITECTURE}")

cmake/Platform/System/VersionDetector.cmake

@@ -51,7 +51,7 @@ function(detect_sdk_version)
 
     find_file(ARDUINO_CMAKE_VERSION_FILE_PATH
             NAMES version.txt
-            PATHS "${ARDUINO_SDK_PATH}"
+            PATHS "${ARDUINO_CMAKE_SDK_PATH}"
             PATH_SUFFIXES lib
             DOC "Path to Arduino's version file"
             NO_CMAKE_FIND_ROOT_PATH)
@@ -71,7 +71,6 @@ function(detect_sdk_version)
     list(GET split_version 1 split_version_minor)
     list(GET split_version 2 split_version_patch)
 
-
     set(ARDUINO_CMAKE_SDK_VERSION "${raw_version}" CACHE STRING "Arduino SDK Version")
     set(ARDUINO_CMAKE_SDK_VERSION_MAJOR ${split_version_major} CACHE STRING
             "Arduino SDK Major Version")
@@ -87,6 +86,6 @@ function(detect_sdk_version)
     _get_normalized_sdk_version(normalized_sdk_version)
     set(runtime_ide_version "${normalized_sdk_version}" CACHE STRING "")
 
-    message(STATUS "Arduino SDK version ${ARUDINO_CMAKE_SDK_VERSION}: ${ARDUINO_SDK_PATH}")
+    message(STATUS "Arduino SDK version ${ARDUINO_CMAKE_SDK_VERSION}: ${ARDUINO_CMAKE_SDK_PATH}")
 
 endfunction()