di0ib
/
controller
Следить 1
В избранное 0
Форкнуть 0
Код Релизы 0 Активность
Просмотр исходного кода

Fixing regression build

simple
Jacob Alexander 11 лет назад
Родитель
99b3deba67
Сommit
9dcb0f7b66
2 измененных файлов: 8 добавлений и 8 удалений
Единый вид Показать статистику Diff
  1. 2
    2
      CMakeLists.txt
  2. 6
    6
      setup.cmake

+ 2
- 2
CMakeLists.txt Просмотреть файл

#| teensy-loader-cli must be in the user's path #| teensy-loader-cli must be in the user's path
if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" ) if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
configure_file( LoadFile/bash load ) configure_file( LoadFile/bash load )
endif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
endif()


#| TODO Windows #| TODO Windows
if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" ) if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
configure_file( LoadFile/bash load ) configure_file( LoadFile/bash load )
endif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
endif()



+ 6
- 6
setup.cmake Просмотреть файл

### ###
# Module Overrides (Used in the buildall.bash script) # Module Overrides (Used in the buildall.bash script)
# #
if ( ( DEFINED ${ScanModuleOverride} ) AND ( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Scan/${ScanModuleOverride} ) )
if ( ( DEFINED ScanModuleOverride ) AND ( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Scan/${ScanModuleOverride} ) )
set( ScanModule ${ScanModuleOverride} ) set( ScanModule ${ScanModuleOverride} )
endif ( ( DEFINED ${ScanModuleOverride} ) AND ( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Scan/${ScanModuleOverride} ) )
endif ()






endforeach( mod_var ${ARGN} ) endforeach( mod_var ${ARGN} )


message( FATAL_ERROR "${ModulePath} does not support the ${COMPILER_FAMILY} family..." ) message( FATAL_ERROR "${ModulePath} does not support the ${COMPILER_FAMILY} family..." )
endfunction( ModuleCompatibility ModulePath )
endfunction()






string( LENGTH "${Git_Modified_INFO}" Git_Modified_LENGTH ) string( LENGTH "${Git_Modified_INFO}" Git_Modified_LENGTH )
if ( ${Git_Modified_LENGTH} GREATER 2 ) if ( ${Git_Modified_LENGTH} GREATER 2 )
string( SUBSTRING "${Git_Modified_INFO}" 1 2 Git_Modified_Flag_INFO ) string( SUBSTRING "${Git_Modified_INFO}" 1 2 Git_Modified_Flag_INFO )
endif ( ${Git_Modified_LENGTH} GREATER 2 )
endif ()


#| Branch #| Branch
execute_process( COMMAND git rev-parse --abbrev-ref HEAD execute_process( COMMAND git rev-parse --abbrev-ref HEAD
#| Only use Git variables if we were successful in calling the commands #| Only use Git variables if we were successful in calling the commands
if ( ${Git_RETURN} EQUAL 0 ) if ( ${Git_RETURN} EQUAL 0 )
set( GitLastCommitDate "${Git_Modified_Flag_INFO}${Git_Branch_INFO} - ${Git_Date_INFO}" ) set( GitLastCommitDate "${Git_Modified_Flag_INFO}${Git_Branch_INFO} - ${Git_Date_INFO}" )
else ( ${Git_RETURN} EQUAL 0 )
else ()
# TODO Figure out a good way of finding the current branch + commit date + modified # TODO Figure out a good way of finding the current branch + commit date + modified
set( GitLastCommitDate "Pft...Windows Build" ) set( GitLastCommitDate "Pft...Windows Build" )
endif ( ${Git_RETURN} EQUAL 0 )
endif ()




#| Uses CMake variables to include as defines #| Uses CMake variables to include as defines