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

Updating the build script to remove includes hack 

- Providing HEAD_DIR variable that can be prepended to refer to the top of the source directory
simple
Jacob Alexander 12 years ago
parent
fd569b9de3
commit
a0439f627b
3 changed files with 27 additions and 23 deletions
Split View Show Diff Stats
  1. 2
    0
      CMakeLists.txt
  2. 2
    2
      Scan/matrix/setup.cmake
  3. 23
    21
      setup.cmake

+ 2
- 0
CMakeLists.txt View File

@@ -12,6 +12,8 @@ include( CMakeForceCompiler )
set( CMAKE_SYSTEM_NAME Generic )
cmake_force_c_compiler ( avr-gcc AVRCCompiler )
cmake_force_cxx_compiler( avr-g++ AVRCxxCompiler )
set( CMAKE_CROSSCOMPILING on )
message( STATUS ${CMAKE_CROSSCOMPILING})


###

+ 2
- 2
Scan/matrix/setup.cmake View File

@@ -17,7 +17,7 @@ set( SCAN_SRCS


###
# Module Specific Options TODO Fixme!! (../)
# Module Specific Options
#
add_definitions( -I../Keymap )
add_definitions( -I${HEAD_DIR}/Keymap )


+ 23
- 21
setup.cmake View File

@@ -12,6 +12,7 @@
# Project Modules
#

#| Note: This is the only section you probably want to modify
#| Each module is defined by it's own folder (e.g. Scan/Matrix represents the "Matrix" module)
#| All of the modules must be specified, as they generate the sources list of files to compile
#| Any modifications to this file will cause a complete rebuild of the project
@@ -32,6 +33,7 @@ set( DebugModule "basic" )




###
# Path Setup
#
@@ -40,6 +42,9 @@ set( MacroModulePath "Macro/${MacroModule}" )
set( USBModulePath "USB/${USBModule}" )
set( DebugModulePath "Debug/${DebugModule}" )

#| Top-level directory adjustment
set( HEAD_DIR "${PROJECT_SOURCE_DIR}" )




@@ -50,13 +55,14 @@ set( DebugModulePath "Debug/${DebugModule}" )
#| Additional options, usually define settings
add_definitions()

#| Include path for each of the modules TODO Fixme!! (../)
add_definitions("
-I../${ScanModulePath}
-I../${MacroModulePath}
-I../${USBModulePath}
-I../${DebugModulePath}
")
#| Include path for each of the modules
add_definitions(
-I${HEAD_DIR}/${ScanModulePath}
-I${HEAD_DIR}/${MacroModulePath}
-I${HEAD_DIR}/${USBModulePath}
-I${HEAD_DIR}/${DebugModulePath}
)




@@ -81,29 +87,25 @@ endmacro( PathPrepend )


#| Scan Module
include ( "${ScanModulePath}/setup.cmake" )
PathPrepend( SCAN_SRCS ${ScanModulePath} ${SCAN_SRCS} )
include ( "${ScanModulePath}/setup.cmake" )
PathPrepend( SCAN_SRCS ${ScanModulePath} ${SCAN_SRCS} )

#| Macro Module
include ( "${MacroModulePath}/setup.cmake" )
include ( "${MacroModulePath}/setup.cmake" )
PathPrepend( MACRO_SRCS ${MacroModulePath} ${MACRO_SRCS} )

#| USB Module
include ( "${USBModulePath}/setup.cmake" )
PathPrepend( USB_SRCS ${USBModulePath} ${USB_SRCS} )
include ( "${USBModulePath}/setup.cmake" )
PathPrepend( USB_SRCS ${USBModulePath} ${USB_SRCS} )

#| Debugging Module
include ( "${DebugModulePath}/setup.cmake" )
include ( "${DebugModulePath}/setup.cmake" )
PathPrepend( DEBUG_SRCS ${DebugModulePath} ${DEBUG_SRCS} )


#| Print list of all module sources
message( STATUS "Detected Scan Module Source Files:
${SCAN_SRCS}")
message( STATUS "Detected Macro Module Source Files:
${MACRO_SRCS}")
message( STATUS "Detected USB Module Source Files:
${USB_SRCS}")
message( STATUS "Detected Debug Module Source Files:
${DEBUG_SRCS}")
message( STATUS "Detected Scan Module Source Files: \n${SCAN_SRCS}")
message( STATUS "Detected Macro Module Source Files:\n${MACRO_SRCS}")
message( STATUS "Detected USB Module Source Files: \n${USB_SRCS}")
message( STATUS "Detected Debug Module Source Files:\n${DEBUG_SRCS}")