Updating Cygwin build environment for AVR and ARM.
This commit is contained in:
parent
97308d3749
commit
50d1f8c7e6
@ -89,6 +89,12 @@ ModuleCompatibility( ${DebugModulePath} ${DebugModuleCompatibility} )
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
###
|
||||||
|
# CMake Module Checking
|
||||||
|
#
|
||||||
|
find_package( Git REQUIRED )
|
||||||
|
|
||||||
|
|
||||||
###
|
###
|
||||||
# Build Targets
|
# Build Targets
|
||||||
#
|
#
|
||||||
|
@ -82,7 +82,11 @@
|
|||||||
|
|
||||||
|
|
||||||
// Static String Printing
|
// Static String Printing
|
||||||
|
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
|
||||||
#define print(s) _print(PSTR(s))
|
#define print(s) _print(PSTR(s))
|
||||||
|
#else
|
||||||
|
#define print(s) _print(s)
|
||||||
|
#endif
|
||||||
|
|
||||||
void _print(const char *s);
|
void _print(const char *s);
|
||||||
void printstrs( char* first, ... );
|
void printstrs( char* first, ... );
|
||||||
|
@ -30,6 +30,7 @@ add_definitions(
|
|||||||
# Compiler Family Compatibility
|
# Compiler Family Compatibility
|
||||||
#
|
#
|
||||||
set( ScanModuleCompatibility
|
set( ScanModuleCompatibility
|
||||||
|
arm
|
||||||
avr
|
avr
|
||||||
)
|
)
|
||||||
|
|
||||||
|
28
setup.cmake
28
setup.cmake
@ -235,28 +235,14 @@ execute_process( COMMAND git config --get remote.origin.url
|
|||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
)
|
)
|
||||||
|
|
||||||
#| Date Macro
|
#| Build Date
|
||||||
macro ( dateNow RESULT )
|
execute_process( COMMAND "date" "+%Y-%m-%d %T %z"
|
||||||
if ( WIN32 )
|
OUTPUT_VARIABLE ${RESULT}
|
||||||
execute_process( COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT} OUTPUT_STRIP_TRAILING_WHITESPACE )
|
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 ()
|
|
||||||
|
|
||||||
|
#| Last Commit Date
|
||||||
|
set( GitLastCommitDate "${Git_Modified_Flag_INFO}${Git_Branch_INFO} - ${Git_Date_INFO}" )
|
||||||
|
|
||||||
#| Uses CMake variables to include as defines
|
#| Uses CMake variables to include as defines
|
||||||
#| Primarily for USB configuration
|
#| Primarily for USB configuration
|
||||||
|
Reference in New Issue
Block a user