Adding in USB module updates from Teensyduino 1.18rc2.

[kiibohd-controller.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d52b39e86c8589ce63a59c1ca454f05ea858e26a..177ee14a19b82ba4b951cf13e3b6750c168280b6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ include( AddFileDependencies )
 #| "avr"       # Teensy++ 1.0
 #| "avr"       # Teensy++ 2.0
 #| "arm"       # Teensy   3.0
-#set( COMPILER_FAMILY "arm" )
-set( COMPILER_FAMILY "avr" )
+set( COMPILER_FAMILY "arm" )
+#set( COMPILER_FAMILY "avr" )
 
 message( STATUS "Compiler Family:" )
 message( "${COMPILER_FAMILY}" )
@@ -70,7 +70,7 @@ set( SRCS
        ${COMPILER_SRCS}
        ${SCAN_SRCS}
        ${MACRO_SRCS}
-       ${USB_SRCS}
+       ${OUTPUT_SRCS}
        ${DEBUG_SRCS}
 )
 
@@ -84,10 +84,10 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 #
 
 #| Check for whether the set modules are compatible with the specified compiler family
-ModuleCompatibility( ${ScanModulePath}  ${ScanModuleCompatibility}  )
-ModuleCompatibility( ${MacroModulePath} ${MacroModuleCompatibility} )
-ModuleCompatibility( ${USBModulePath}   ${USBModuleCompatibility}   )
-ModuleCompatibility( ${DebugModulePath} ${DebugModuleCompatibility} )
+ModuleCompatibility( ${ScanModulePath}   ${ScanModuleCompatibility}   )
+ModuleCompatibility( ${MacroModulePath}  ${MacroModuleCompatibility}  )
+ModuleCompatibility( ${OutputModulePath} ${OutputModuleCompatibility} )
+ModuleCompatibility( ${DebugModulePath}  ${DebugModuleCompatibility}  )
 
 
 
@@ -152,10 +152,10 @@ add_custom_target( SizeAfter ALL ${SIZE} --target=${FORMAT} ${TARGET_HEX} ${TARG
 #| teensy-loader-cli must be in the user's path
 if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
        configure_file( LoadFile/bash load )
-endif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
+endif()
 
 #| TODO Windows
 if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
        configure_file( LoadFile/bash load )
-endif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
+endif()