Support for Arduino 1.6 on Mac OS X

francoiscampbell · Aug 7, 2015 · 3d36e26 · 3d36e26
1 parent 29fa493
commit 3d36e26
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/io/github/francoiscambell/clionarduinoplugin/resources/arduino-cmake"]
 	path = src/io/github/francoiscambell/clionarduinoplugin/resources/arduino-cmake
-	url = git://github.com/queezythegreat/arduino-cmake.git
+	url = git://github.com/altexdim/arduino-cmake.git
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -62,6 +62,10 @@
         ]]></description>
 
     <change-notes><![CDATA[
+        <b>1.1.0</b>
+        <ul>
+            <li>Compatiblity with Arduino SDK 1.6 on Mac OS X</li>
+        </ul>
         <b>1.0.2</b>
         <ul>
             <li>Removed Groovy runtime, no longer necessary</li>

diff --git a/src/io/github/francoiscambell/clionarduinoplugin/resources/arduino-cmake b/src/io/github/francoiscambell/clionarduinoplugin/resources/arduino-cmake
+3 −1		.gitignore
+12 −1		CMakeLists.txt
+4 −0		README.original.rst
+176 −0		README.txt
+6 −0		cmake/ArduinoToolchain.cmake
+129 −59		cmake/Platform/Arduino.cmake
+0 −26		example/Blink/Blink.ino
+0 −5		example/Blink/config.h
+11 −96		example/CMakeLists.txt
+0 −22		example/blink.cpp
+0 −19		example/blink_lib.cpp
+0 −17		example/blink_lib.h
+23 −0		example/example.cpp