From: Jacob Alexander <haata@kiibohd.com>
Date: Thu, 10 Apr 2014 03:06:19 +0000 (-0700)
Subject: Updating Cygwin build environment for AVR and ARM.
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=50d1f8c7e687c3530e94c8c382dec440eb37cc3b;p=kiibohd-controller.git

Updating Cygwin build environment for AVR and ARM.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f1c17d..8526109 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,12 @@ ModuleCompatibility( ${DebugModulePath}  ${DebugModuleCompatibility}  )
 
 
 
+###
+# CMake Module Checking
+#
+find_package( Git REQUIRED )
+
+
 ###
 # Build Targets
 #
diff --git a/Debug/print/print.h b/Debug/print/print.h
index fcaca3f..a62a9b6 100644
--- a/Debug/print/print.h
+++ b/Debug/print/print.h
@@ -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 --git a/Scan/SKM67001/setup.cmake b/Scan/SKM67001/setup.cmake
index 62fdc91..e8ac233 100644
--- a/Scan/SKM67001/setup.cmake
+++ b/Scan/SKM67001/setup.cmake
@@ -30,6 +30,7 @@ add_definitions(
 # Compiler Family Compatibility
 #
 set( ScanModuleCompatibility
+	arm
 	avr
 )
 
diff --git a/setup.cmake b/setup.cmake
index 92afafc..4cb8890 100644
--- a/setup.cmake
+++ b/setup.cmake
@@ -235,28 +235,14 @@ execute_process( COMMAND git config --get remote.origin.url
 	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 )
-
-
-#| 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 ()
+#| Build Date
+execute_process( COMMAND "date" "+%Y-%m-%d %T %z"
+	OUTPUT_VARIABLE ${RESULT}
+	OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 
+#| 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