Fix test build
parent
fc5e8a6ae0
commit
fdb2058d2b
|
|
@ -41,6 +41,17 @@ set(CUSTOM_COMPILE_OPTIONS
|
||||||
# Resolve BUILD_NUMBER and PROJECT_VERSION_* variables
|
# Resolve BUILD_NUMBER and PROJECT_VERSION_* variables
|
||||||
resolve_version_variables()
|
resolve_version_variables()
|
||||||
|
|
||||||
|
add_compile_definitions(
|
||||||
|
PROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
|
||||||
|
PROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}
|
||||||
|
PROJECT_VERSION_REV=${PROJECT_VERSION_REV}
|
||||||
|
PROJECT_BUILD_NUMBER=${BUILD_NUMBER}
|
||||||
|
FW_VERSION_FULL_STR="${PROJECT_VERSION_FULL}"
|
||||||
|
FW_VERSION_STR="${PROJECT_VERSION}"
|
||||||
|
FW_VERSION_SUFFIX_STR="${PROJECT_VERSION_SUFFIX}"
|
||||||
|
FW_VERSION_SUFFIX_SHORT_STR="${PROJECT_VERSION_SUFFIX_SHORT}"
|
||||||
|
)
|
||||||
|
|
||||||
# Check GCC Version
|
# Check GCC Version
|
||||||
get_recommended_gcc_version(RECOMMENDED_TOOLCHAIN_VERSION)
|
get_recommended_gcc_version(RECOMMENDED_TOOLCHAIN_VERSION)
|
||||||
if(CMAKE_CROSSCOMPILING AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL
|
if(CMAKE_CROSSCOMPILING AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL
|
||||||
|
|
|
||||||
|
|
@ -2,18 +2,6 @@ target_sources(firmware PRIVATE application.cpp debug.cpp main.cpp registers.cpp
|
||||||
|
|
||||||
target_link_libraries(firmware LUFA)
|
target_link_libraries(firmware LUFA)
|
||||||
|
|
||||||
target_compile_definitions(
|
|
||||||
firmware
|
|
||||||
PRIVATE
|
|
||||||
PROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
|
|
||||||
PROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}
|
|
||||||
PROJECT_VERSION_REV=${PROJECT_VERSION_REV}
|
|
||||||
PROJECT_BUILD_NUMBER=${BUILD_NUMBER}
|
|
||||||
FW_VERSION_FULL_STR="${PROJECT_VERSION_FULL}"
|
|
||||||
FW_VERSION_STR="${PROJECT_VERSION}"
|
|
||||||
FW_VERSION_SUFFIX_STR="${PROJECT_VERSION_SUFFIX}"
|
|
||||||
FW_VERSION_SUFFIX_SHORT_STR="${PROJECT_VERSION_SUFFIX_SHORT}"
|
|
||||||
)
|
|
||||||
add_subdirectory(hal)
|
add_subdirectory(hal)
|
||||||
add_subdirectory(logic)
|
add_subdirectory(logic)
|
||||||
add_subdirectory(modules)
|
add_subdirectory(modules)
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ add_executable(
|
||||||
cut_filament_tests
|
cut_filament_tests
|
||||||
${CMAKE_SOURCE_DIR}/src/application.cpp
|
${CMAKE_SOURCE_DIR}/src/application.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/version.c
|
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ add_executable(
|
||||||
eject_filament_tests
|
eject_filament_tests
|
||||||
${CMAKE_SOURCE_DIR}/src/application.cpp
|
${CMAKE_SOURCE_DIR}/src/application.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/version.c
|
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ add_executable(
|
||||||
failing_tmc_tests
|
failing_tmc_tests
|
||||||
${CMAKE_SOURCE_DIR}/src/application.cpp
|
${CMAKE_SOURCE_DIR}/src/application.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/version.c
|
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ add_executable(
|
||||||
feed_to_bondtech_tests
|
feed_to_bondtech_tests
|
||||||
${CMAKE_SOURCE_DIR}/src/application.cpp
|
${CMAKE_SOURCE_DIR}/src/application.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/version.c
|
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ add_executable(
|
||||||
feed_to_finda_tests
|
feed_to_finda_tests
|
||||||
${CMAKE_SOURCE_DIR}/src/application.cpp
|
${CMAKE_SOURCE_DIR}/src/application.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/version.c
|
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ add_executable(
|
||||||
homing_tests
|
homing_tests
|
||||||
${CMAKE_SOURCE_DIR}/src/application.cpp
|
${CMAKE_SOURCE_DIR}/src/application.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/version.c
|
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ add_executable(
|
||||||
load_filament_tests
|
load_filament_tests
|
||||||
${CMAKE_SOURCE_DIR}/src/application.cpp
|
${CMAKE_SOURCE_DIR}/src/application.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/version.c
|
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ add_executable(
|
||||||
tool_change_tests
|
tool_change_tests
|
||||||
${CMAKE_SOURCE_DIR}/src/application.cpp
|
${CMAKE_SOURCE_DIR}/src/application.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/version.c
|
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ add_executable(
|
||||||
unload_filament_tests
|
unload_filament_tests
|
||||||
${CMAKE_SOURCE_DIR}/src/application.cpp
|
${CMAKE_SOURCE_DIR}/src/application.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/version.c
|
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ add_executable(
|
||||||
unload_to_finda_tests
|
unload_to_finda_tests
|
||||||
${CMAKE_SOURCE_DIR}/src/application.cpp
|
${CMAKE_SOURCE_DIR}/src/application.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
${CMAKE_SOURCE_DIR}/src/registers.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/version.c
|
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/command_base.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/cut_filament.cpp
|
||||||
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
${CMAKE_SOURCE_DIR}/src/logic/eject_filament.cpp
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue