From f3b9db8a2c678751acd297851064dda0d3db18bc Mon Sep 17 00:00:00 2001 From: Ryan howard Date: Wed, 12 Jun 2024 15:06:43 -0400 Subject: [PATCH] fix cmake lists --- gripper/core/CMakeLists.txt | 2 +- pipettes/core/CMakeLists.txt | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gripper/core/CMakeLists.txt b/gripper/core/CMakeLists.txt index 75bb7155b..c939e9121 100644 --- a/gripper/core/CMakeLists.txt +++ b/gripper/core/CMakeLists.txt @@ -1,9 +1,9 @@ function(target_gripper_core TARGET) if(${USE_SENSOR_MOVE}) target_compile_definitions(${TARGET} PUBLIC USE_SENSOR_MOVE) + endif() target_compile_definitions(${TARGET} PUBLIC SENSOR_BUFF_SIZE=500) target_compile_definitions(${TARGET} PUBLIC USE_TWO_BUFFERS=true) - endif() target_sources(${TARGET} PUBLIC ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/can_tasks.cpp ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/tasks.cpp diff --git a/pipettes/core/CMakeLists.txt b/pipettes/core/CMakeLists.txt index a1860f3d9..29daf4dd4 100644 --- a/pipettes/core/CMakeLists.txt +++ b/pipettes/core/CMakeLists.txt @@ -18,8 +18,6 @@ function(target_pipettes_core_single TARGET REVISION) target_pipettes_core_common(${TARGET} ${REVISION}) target_compile_definitions(${TARGET} PUBLIC PIPETTE_TYPE_DEFINE=SINGLE_CHANNEL) target_compile_definitions(${TARGET} PUBLIC SENSOR_BUFF_SIZE=500) - if(${USE_SENSOR_MOVE}) - endif() target_sources(${TARGET} PUBLIC ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/can_task_low_throughput.cpp) endfunction() @@ -28,9 +26,7 @@ function(target_pipettes_core_multi TARGET REVISION) target_pipettes_core_common(${TARGET} ${REVISION}) target_compile_definitions(${TARGET} PUBLIC PIPETTE_TYPE_DEFINE=EIGHT_CHANNEL) target_compile_definitions(${TARGET} PUBLIC SENSOR_BUFF_SIZE=500) - if(${USE_SENSOR_MOVE}) target_compile_definitions(${TARGET} PUBLIC USE_TWO_BUFFERS=true) - endif() target_sources(${TARGET} PUBLIC ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/can_task_low_throughput.cpp) endfunction() @@ -39,9 +35,7 @@ function(target_pipettes_core_96 TARGET REVISION) target_pipettes_core_common(${TARGET} ${REVISION}) target_compile_definitions(${TARGET} PUBLIC PIPETTE_TYPE_DEFINE=NINETY_SIX_CHANNEL) target_compile_definitions(${TARGET} PUBLIC SENSOR_BUFF_SIZE=500) - if(${USE_SENSOR_MOVE}) target_compile_definitions(${TARGET} PUBLIC USE_TWO_BUFFERS=true) - endif() target_sources(${TARGET} PUBLIC ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/can_task_high_throughput.cpp) endfunction() @@ -50,9 +44,7 @@ function(target_pipettes_core_384 TARGET REVISION) target_pipettes_core_common(${TARGET} ${REVISION}) target_compile_definitions(${TARGET} PUBLIC PIPETTE_TYPE_DEFINE=THREE_EIGHTY_FOUR_CHANNEL) target_compile_definitions(${TARGET} PUBLIC SENSOR_BUFF_SIZE=500) - if(${USE_SENSOR_MOVE}) target_compile_definitions(${TARGET} PUBLIC USE_TWO_BUFFERS=true) - endif() target_sources(${TARGET} PUBLIC ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/can_task_high_throughput.cpp) endfunction()