# HG changeset patch
# User Jacob Alexander <haata@kiibohd.com>
# Date 1397099179 25200
# Node ID ae647392a05b6459db754e5526bee5d6fff1bb3e
# Parent  670fc9c3a739543358bd76a7d565abce0026f0db
Updating Cygwin build environment for AVR and ARM.

diff -r 670fc9c3a739 -r ae647392a05b CMakeLists.txt
--- a/CMakeLists.txt	Sun Apr 06 13:12:31 2014 -0700
+++ b/CMakeLists.txt	Wed Apr 09 20:06:19 2014 -0700
@@ -90,6 +90,12 @@
 
 
 ###
+# CMake Module Checking
+#
+find_package( Git REQUIRED )
+
+
+###
 # Build Targets
 #
 
diff -r 670fc9c3a739 -r ae647392a05b Debug/print/print.h
--- a/Debug/print/print.h	Sun Apr 06 13:12:31 2014 -0700
+++ b/Debug/print/print.h	Wed Apr 09 20:06:19 2014 -0700
@@ -82,7 +82,11 @@
 
 
 // Static String Printing
+#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
 #define print(s) _print(PSTR(s))
+#else
+#define print(s) _print(s)
+#endif
 
 void _print(const char *s);
 void printstrs( char* first, ... );
diff -r 670fc9c3a739 -r ae647392a05b Scan/SKM67001/setup.cmake
--- a/Scan/SKM67001/setup.cmake	Sun Apr 06 13:12:31 2014 -0700
+++ b/Scan/SKM67001/setup.cmake	Wed Apr 09 20:06:19 2014 -0700
@@ -30,6 +30,7 @@
 # Compiler Family Compatibility
 #
 set( ScanModuleCompatibility
+	arm
 	avr
 )
 
diff -r 670fc9c3a739 -r ae647392a05b setup.cmake
--- a/setup.cmake	Sun Apr 06 13:12:31 2014 -0700
+++ b/setup.cmake	Wed Apr 09 20:06:19 2014 -0700
@@ -235,28 +235,14 @@
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-#| Date Macro
-macro ( dateNow RESULT )
-	if ( WIN32 )
-		execute_process( COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT} OUTPUT_STRIP_TRAILING_WHITESPACE )
-	elseif ( UNIX )
-		execute_process( COMMAND "date" "+%Y-%m-%d %T %z" OUTPUT_VARIABLE ${RESULT} OUTPUT_STRIP_TRAILING_WHITESPACE )
-	else ()
-		message( send_error "date not implemented" )
-		set( ${RESULT} 000000 )
-	endif ()
-endmacro (dateNow)
-dateNow( Build_Date )
+#| Build Date
+execute_process( COMMAND "date" "+%Y-%m-%d %T %z"
+	OUTPUT_VARIABLE ${RESULT}
+	OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 
-
-#| Only use Git variables if we were successful in calling the commands
-if ( ${Git_RETURN} EQUAL 0 )
-	set( GitLastCommitDate "${Git_Modified_Flag_INFO}${Git_Branch_INFO} - ${Git_Date_INFO}" )
-else ()
-	# TODO Figure out a good way of finding the current branch + commit date + modified
-	set( GitLastCommitDate "Pft...Windows Build" )
-endif ()
-
+#| Last Commit Date
+set( GitLastCommitDate "${Git_Modified_Flag_INFO}${Git_Branch_INFO} - ${Git_Date_INFO}" )
 
 #| Uses CMake variables to include as defines
 #| Primarily for USB configuration