Mercurial > louis > kiibohd-controller
changeset 260:5dbe3bf2dc42
Adding more CMake log information.
author | Jacob Alexander <haata@kiibohd.com> |
---|---|
date | Wed, 31 Dec 2014 13:42:00 -0800 |
parents | 81b2f34bcd06 |
children | f0c55e3c0190 |
files | Lib/CMake/arm.cmake Lib/CMake/avr.cmake Lib/CMake/kll.cmake |
diffstat | 3 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Lib/CMake/arm.cmake Sun Dec 28 20:06:39 2014 -0800 +++ b/Lib/CMake/arm.cmake Wed Dec 31 13:42:00 2014 -0800 @@ -89,18 +89,21 @@ #| USB Defines, this is how the loader programs detect which type of chip base is used +message( STATUS "Bootloader Type:" ) if ( "${CHIP}" MATCHES "mk20dx128vlf5" ) set( VENDOR_ID "0x1C11" ) set( PRODUCT_ID "0xB04D" ) set( BOOT_VENDOR_ID "0x1C11" ) set( BOOT_PRODUCT_ID "0xB007" ) set( DFU 1 ) + message( "dfu" ) elseif ( "${CHIP}" MATCHES "mk20dx128" OR "${CHIP}" MATCHES "mk20dx256" ) set( VENDOR_ID "0x1C11" ) set( PRODUCT_ID "0xB04D" ) set( BOOT_VENDOR_ID "0x16c0" ) # TODO Double check, this is likely incorrect set( BOOT_PRODUCT_ID "0x0487" ) set( TEENSY 1 ) + message( "Teensy" ) endif ()
--- a/Lib/CMake/avr.cmake Sun Dec 28 20:06:39 2014 -0800 +++ b/Lib/CMake/avr.cmake Wed Dec 31 13:42:00 2014 -0800 @@ -36,10 +36,6 @@ message( "${MCU}" ) -#| Indicate to later build step that this is a Teensy -set( Teensy ) - - #| Chip Size Database #| Teensy 1.0 if ( "${CHIP}" MATCHES "at90usb162" ) @@ -67,10 +63,6 @@ endif () -#| Only Teensy based AVRs supported -set ( TEENSY 1 ) - - #| Extra Compiler Sources #| Mostly for convenience functions like interrupt handlers set( COMPILER_SRCS @@ -94,6 +86,12 @@ set( BOOT_PRODUCT_ID "0x047D" ) +#| Only Teensy based AVRs supported +set ( TEENSY 1 ) +message( STATUS "Bootloader Type:" ) +message( "Teensy" ) + + #| Compiler flag to set the C Standard level. #| c89 = "ANSI" C #| gnu89 = c89 plus GCC extensions
--- a/Lib/CMake/kll.cmake Sun Dec 28 20:06:39 2014 -0800 +++ b/Lib/CMake/kll.cmake Wed Dec 31 13:42:00 2014 -0800 @@ -19,6 +19,8 @@ # KLL Installation (Make sure repo has been cloned) # +message ( STATUS "Checking for latest kll version:" ) + if ( NOT EXISTS "${PROJECT_SOURCE_DIR}/kll/kll.py" ) # Make sure git is available find_package ( Git REQUIRED )