Added dependency detection for Windows

Added Windows enviroment setup to README

Author: queezythegreat

README.markdown

@@ -28,7 +28,6 @@ TODO:
 
 * Sketch conversion (PDE files)
 * Setup dependency detection for:
-    * Windows
     * Mac OS X
 * Test more complex configurations and error handling
 
@@ -39,6 +38,7 @@ Contents
 2. Setting up Arduino CMake
 3. Creating firmware images
 4. Creating libraries
+5. Windows Enviroment Setup
 
 Getting Started
 ----------------
@@ -206,3 +206,12 @@ Once that library is defined we can use it in our other firmware images... Lets
 
     generate_arduino_firmware(blink)
 
+
+Windows Enviroment Setup
+------------------------
+
+On Windows the *Arduino SDK* is self contained and has everything needed for building. The only thing that has to be done is to place the *Arduino SDK* either on the **system path** or within the system **Program Files** directory. Also you will need to add the ${ARDUINO_SDK_PATH}/hardware/tools/avr/utils/bin directory path to your system path, just make sure it is the first thing on list.
+
+Once that is done you can start using CMake the usual way, just make sure to chose a **MSYS Makefile** type generator.
+
+NOTE: Don't change the default **Arduino SDK** directory name, otherwise auto detection will no work properly!

cmake/modules/FindArduino.cmake

@@ -47,7 +47,7 @@
 
 
 find_path(ARDUINO_SDK_PATH
-          NAMES examples lib libraries reference tools hardware revisions.txt
+          NAMES lib/version.txt hardware libraries
           PATH_SUFFIXES  share/arduino
           DOC "Arduino Development Kit path.")
 
@@ -57,7 +57,7 @@ find_path(ARDUINO_SDK_PATH
 # Load the Arduino SDK board settings from the boards.txt file.
 #
 function(LOAD_BOARD_SETTINGS)
-    if(NOT ARDUINO_BOARDS)
+    if(NOT ARDUINO_BOARDS AND ARDUINO_BOARDS_PATH)
     file(STRINGS ${ARDUINO_BOARDS_PATH} BOARD_SETTINGS)
     foreach(BOARD_SETTING ${BOARD_SETTINGS})
         if("${BOARD_SETTING}" MATCHES "^.*=.*")
@@ -479,13 +479,12 @@ endfunction()
 # Detects the Arduino SDK Version based on the revisions.txt file.
 #
 function(detect_arduino_version VAR_NAME)
-    file(STRINGS ${ARDUINO_REVISIONS_PATH} REVISIONS_CONTENT)
-    foreach(LINE ${REVISIONS_CONTENT})
-        if("${LINE}" MATCHES " *ARDUINO [0]+([0-9]+) - (.*)")
+    if(ARDUINO_VERSION_PATH)
+        file(READ ${ARDUINO_VERSION_PATH} ARD_VERSION)
+        if("${ARD_VERSION}" MATCHES " *[0]+([0-9]+)")
             set(${VAR_NAME} ${CMAKE_MATCH_1} PARENT_SCOPE)
-            return()
         endif()
-    endforeach()
+    endif()
 endfunction()
 
 
@@ -518,6 +517,10 @@ if(NOT ARDUINO_FOUND)
               NAMES revisions.txt
               PATHS ${ARDUINO_SDK_PATH})
 
+    find_file(ARDUINO_VERSION_PATH
+              NAMES lib/version.txt
+              PATHS ${ARDUINO_SDK_PATH})
+
     find_program(ARDUINO_AVRDUDE_PROGRAM
                  NAMES avrdude
                  PATHS ${ARDUINO_SDK_PATH}
@@ -533,8 +536,16 @@ if(NOT ARDUINO_FOUND)
      set(ARDUINO_OBJCOPY_HEX_FLAGS -O ihex -R .eeprom
          CACHE STRING "")
 
-     detect_arduino_version(ARDUINO_SDK_VERSION)
-     set(ARDUINO_SDK_VERSION ${ARDUINO_SDK_VERSION} CACHE STRING "Arduino SDK Version")
+     if(ARDUINO_SDK_PATH)
+         detect_arduino_version(ARDUINO_SDK_VERSION)
+         set(ARDUINO_SDK_VERSION ${ARDUINO_SDK_VERSION} CACHE STRING "Arduino SDK Version")
+     endif(ARDUINO_SDK_PATH)
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(Arduino
+                                      REQUIRED_VARS ARDUINO_SDK_PATH
+                                                    ARDUINO_SDK_VERSION
+                                      VERSION_VAR ARDUINO_SDK_VERSION)
 
 
      mark_as_advanced(ARDUINO_CORES_PATH
@@ -549,18 +560,5 @@ if(NOT ARDUINO_FOUND)
                       ARDUINO_OBJCOPY_HEX_FLAGS)
     load_board_settings()
 
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(Arduino
-                                      REQUIRED_VARS ARDUINO_SDK_PATH
-                                                    ARDUINO_CORES_PATH
-                                                    ARDUINO_SDK_VERSION
-                                                    ARDUINO_LIBRARIES_PATH
-                                                    ARDUINO_BOARDS_PATH
-                                                    ARDUINO_PROGRAMMERS_PATH
-                                                    ARDUINO_REVISIONS_PATH
-                                                    ARDUINO_AVRDUDE_PROGRAM
-                                                    ARDUINO_AVRDUDE_CONFIG_PATH
-                                                    ARDUINO_SDK_VERSION
-                                      VERSION_VAR ARDUINO_SDK_VERSION)
 endif()
 

cmake/modules/Platform/Arduino.cmake

@@ -1 +0,0 @@
-INCLUDE(Platform/UnixPaths)

cmake/modules/Platform/ArduinoPaths.cmake

@@ -0,0 +1,12 @@
+if(UNIX)
+    INCLUDE(Platform/UnixPaths)
+elseif(WIN32)
+    INCLUDE(Platform/WindowsPaths)
+endif()
+
+if(ARDUINO_SDK_PATH)
+    if(WIN32)
+      LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH ${ARDUINO_SDK_PATH}/hardware/tools/avr/bin)
+      LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH ${ARDUINO_SDK_PATH}/hardware/tools/avr/utils/bin)
+    endif()
+endif()

cmake/toolchains/Arduino.cmake

@@ -9,3 +9,16 @@ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}  -fno-exceptions")
 set(CMAKE_EXE_LINKER_FLAGS "-Os -Wl,--gc-sections")
 set(CMAKE_SHARED_LINKER_FLAGS)
 set(CMAKE_MODULE_LINKER_FLAGS)
+
+set(ARDUINO_PATHS)
+foreach(VERSION RANGE 22 1)
+    list(APPEND ARDUINO_PATHS arduino-00${VERSION})
+endforeach()
+
+find_path(ARDUINO_SDK_PATH
+          NAMES lib/version.txt
+          PATH_SUFFIXES share/arduino
+                        ${ARDUINO_PATHS}
+          DOC "Arduino Development Kit path.")
+
+include(Platform/ArduinoPaths)