Mercurial > louis > kiibohd-controller
changeset 23:92de7e0a0a10
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
| author | Jacob Alexander <triplehaata@gmail.com> |
|---|---|
| date | Thu, 29 Sep 2011 15:30:24 -0700 |
| parents | 7e2217378d23 |
| children | 2d65da455ef3 |
| files | CMakeLists.txt Scan/matrix/setup.cmake setup.cmake |
| diffstat | 3 files changed, 27 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Thu Sep 29 15:07:18 2011 -0700 +++ b/CMakeLists.txt Thu Sep 29 15:30:24 2011 -0700 @@ -12,6 +12,8 @@ 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}) ###
--- a/Scan/matrix/setup.cmake Thu Sep 29 15:07:18 2011 -0700 +++ b/Scan/matrix/setup.cmake Thu Sep 29 15:30:24 2011 -0700 @@ -17,7 +17,7 @@ ### -# Module Specific Options TODO Fixme!! (../) +# Module Specific Options # -add_definitions( -I../Keymap ) +add_definitions( -I${HEAD_DIR}/Keymap )
--- a/setup.cmake Thu Sep 29 15:07:18 2011 -0700 +++ b/setup.cmake Thu Sep 29 15:30:24 2011 -0700 @@ -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 @@ + ### # Path Setup # @@ -40,6 +42,9 @@ set( USBModulePath "USB/${USBModule}" ) set( DebugModulePath "Debug/${DebugModule}" ) +#| Top-level directory adjustment +set( HEAD_DIR "${PROJECT_SOURCE_DIR}" ) + @@ -50,13 +55,14 @@ #| 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 @@ #| 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}")