di0ib
/
controller
İzle 1
Yıldızla 0
Çatalla 0
Kod Sürümler 0 Aktivite
Kaynağa Gözat

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 yıl önce
ebeveyn
fd569b9de3
işleme
a0439f627b
3 değiştirilmiş dosya ile 27 ekleme ve 23 silme
Birleşik Görünüm Farklılık Durumunu Göster
  1. 2
    0
      CMakeLists.txt
  2. 2
    2
      Scan/matrix/setup.cmake
  3. 23
    21
      setup.cmake

+ 2
- 0
CMakeLists.txt Dosyayı Görüntüle

set( CMAKE_SYSTEM_NAME Generic ) set( CMAKE_SYSTEM_NAME Generic )
cmake_force_c_compiler ( avr-gcc AVRCCompiler ) cmake_force_c_compiler ( avr-gcc AVRCCompiler )
cmake_force_cxx_compiler( avr-g++ AVRCxxCompiler ) cmake_force_cxx_compiler( avr-g++ AVRCxxCompiler )
set( CMAKE_CROSSCOMPILING on )
message( STATUS ${CMAKE_CROSSCOMPILING})




### ###

+ 2
- 2
Scan/matrix/setup.cmake Dosyayı Görüntüle





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



+ 23
- 21
setup.cmake Dosyayı Görüntüle

# Project Modules # 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) #| 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 #| 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 #| Any modifications to this file will cause a complete rebuild of the project







### ###
# Path Setup # Path Setup
# #
set( USBModulePath "USB/${USBModule}" ) set( USBModulePath "USB/${USBModule}" )
set( DebugModulePath "Debug/${DebugModule}" ) set( DebugModulePath "Debug/${DebugModule}" )


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







#| Additional options, usually define settings #| Additional options, usually define settings
add_definitions() 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}
)











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


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


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


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




#| Print list of all module sources #| 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}")