di0ib
/
controller
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Updating Cygwin build environment for AVR and ARM.

simple
Jacob Alexander 10 years ago
parent
97308d3749
commit
50d1f8c7e6
4 changed files with 18 additions and 21 deletions
Split View Show Diff Stats
  1. 6
    0
      CMakeLists.txt
  2. 4
    0
      Debug/print/print.h
  3. 1
    0
      Scan/SKM67001/setup.cmake
  4. 7
    21
      setup.cmake

+ 6
- 0
CMakeLists.txt View File

@@ -89,6 +89,12 @@ ModuleCompatibility( ${DebugModulePath} ${DebugModuleCompatibility} )



###
# CMake Module Checking
#
find_package( Git REQUIRED )


###
# Build Targets
#

+ 4
- 0
Debug/print/print.h View File

@@ -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, ... );

+ 1
- 0
Scan/SKM67001/setup.cmake View File

@@ -30,6 +30,7 @@ add_definitions(
# Compiler Family Compatibility
#
set( ScanModuleCompatibility
arm
avr
)


+ 7
- 21
setup.cmake View File

@@ -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