From: andre Ebersold Date: Fri, 17 May 2024 05:08:27 +0000 (+0200) Subject: Fix missing CMakelists.txt formating. X-Git-Url: https://git.ebersold.fr/?a=commitdiff_plain;ds=inline;p=atmel%2Favr.git Fix missing CMakelists.txt formating. --- diff --git a/Communication/CMakeLists.txt b/Communication/CMakeLists.txt index bc83acd..6f0fe91 100644 --- a/Communication/CMakeLists.txt +++ b/Communication/CMakeLists.txt @@ -1,8 +1,4 @@ -##################################################################### +# ############################################################################## # simple AVR library -##################################################################### -add_avr_library( - avrComm - CommunicationHandler.cpp - ) - +# ############################################################################## +add_avr_library(avrComm CommunicationHandler.cpp) diff --git a/Externals/LUFA-210130/CMakeLists.txt b/Externals/LUFA-210130/CMakeLists.txt index 0b3d062..89cd449 100644 --- a/Externals/LUFA-210130/CMakeLists.txt +++ b/Externals/LUFA-210130/CMakeLists.txt @@ -3,59 +3,54 @@ project(LUFA) set(LUFA_ROOT_PATH ${LUFA_SOURCE_DIR}/LUFA) set(ARCH AVR8) # Construct LUFA module source variables -set(LUFA_SRC_USB_COMMON ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/USBController_${ARCH}.c - ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/USBInterrupt_${ARCH}.c - ${LUFA_ROOT_PATH}/Drivers/USB/Core/ConfigDescriptors.c - ${LUFA_ROOT_PATH}/Drivers/USB/Core/Events.c - ${LUFA_ROOT_PATH}/Drivers/USB/Core/USBTask.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Common/HIDParser.c -) - -set(LUFA_SRC_USB_HOST ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Host_${ARCH}.c - ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Pipe_${ARCH}.c - ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/PipeStream_${ARCH}.c - ${LUFA_ROOT_PATH}/Drivers/USB/Core/HostStandardReq.c - ${LUFA_SRC_USB_COMMON} -) - -set(LUFA_SRC_USB_DEVICE ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Device_${ARCH}.c - ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Endpoint_${ARCH}.c - ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/EndpointStream_${ARCH}.c - ${LUFA_ROOT_PATH}/Drivers/USB/Core/DeviceStandardReq.c - ${LUFA_SRC_USB_COMMON} -) +set(LUFA_SRC_USB_COMMON + ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/USBController_${ARCH}.c + ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/USBInterrupt_${ARCH}.c + ${LUFA_ROOT_PATH}/Drivers/USB/Core/ConfigDescriptors.c + ${LUFA_ROOT_PATH}/Drivers/USB/Core/Events.c + ${LUFA_ROOT_PATH}/Drivers/USB/Core/USBTask.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Common/HIDParser.c) + +set(LUFA_SRC_USB_HOST + ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Host_${ARCH}.c + ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Pipe_${ARCH}.c + ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/PipeStream_${ARCH}.c + ${LUFA_ROOT_PATH}/Drivers/USB/Core/HostStandardReq.c + ${LUFA_SRC_USB_COMMON}) + +set(LUFA_SRC_USB_DEVICE + ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Device_${ARCH}.c + ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/Endpoint_${ARCH}.c + ${LUFA_ROOT_PATH}/Drivers/USB/Core/${ARCH}/EndpointStream_${ARCH}.c + ${LUFA_ROOT_PATH}/Drivers/USB/Core/DeviceStandardReq.c + ${LUFA_SRC_USB_COMMON}) set(LUFA_SRC_USBCLASS_DEVICE - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/AudioClassDevice.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/CCIDClassDevice.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/CDCClassDevice.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/HIDClassDevice.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/MassStorageClassDevice.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/MIDIClassDevice.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/PrinterClassDevice.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/RNDISClassDevice.c -) - -set(LUFA_SRC_USBCLASS_HOST ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/AudioClassHost.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/CDCClassHost.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/HIDClassHost.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/MassStorageClassHost.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/MIDIClassHost.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/PrinterClassHost.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/RNDISClassHost.c - ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/StillImageClassHost.c -) - -set(LUFA_SRC_USB ${LUFA_SRC_USB_COMMON} ${LUFA_SRC_USB_HOST} ${LUFA_SRC_USB_DEVICE}) - -set(LUFA_SRC_USBCLASS ${LUFA_SRC_USBCLASS_DEVICE} ${LUFA_SRC_USBCLASS_HOST}) - - - -add_avr_library( - avrUSB - ${LUFA_SRC_USB_COMMON} - ) + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/AudioClassDevice.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/CCIDClassDevice.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/CDCClassDevice.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/HIDClassDevice.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/MassStorageClassDevice.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/MIDIClassDevice.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/PrinterClassDevice.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Device/RNDISClassDevice.c) + +set(LUFA_SRC_USBCLASS_HOST + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/AudioClassHost.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/CDCClassHost.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/HIDClassHost.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/MassStorageClassHost.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/MIDIClassHost.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/PrinterClassHost.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/RNDISClassHost.c + ${LUFA_ROOT_PATH}/Drivers/USB/Class/Host/StillImageClassHost.c) + +set(LUFA_SRC_USB ${LUFA_SRC_USB_COMMON} ${LUFA_SRC_USB_HOST} + ${LUFA_SRC_USB_DEVICE}) + +set(LUFA_SRC_USBCLASS ${LUFA_SRC_USBCLASS_DEVICE} ${LUFA_SRC_USBCLASS_HOST}) + +add_avr_library(avrUSB ${LUFA_SRC_USB_COMMON}) target_compile_definitions(avrUSB-${AVR_MCU} PUBLIC F_USB=${MCU_SPEED}) diff --git a/HAL/ST/CMakeLists.txt b/HAL/ST/CMakeLists.txt index e69de29..8b13789 100644 --- a/HAL/ST/CMakeLists.txt +++ b/HAL/ST/CMakeLists.txt @@ -0,0 +1 @@ + diff --git a/Metadata/CMakeLists.txt b/Metadata/CMakeLists.txt index dd5f5af..fd4dd4b 100644 --- a/Metadata/CMakeLists.txt +++ b/Metadata/CMakeLists.txt @@ -1,41 +1,21 @@ -##################################################################### +# ############################################################################## # simple AVR library -##################################################################### -add_avr_library( - avrPowerswitchParameters - PowerswitchParameterTable.cpp - ) +# ############################################################################## +add_avr_library(avrPowerswitchParameters PowerswitchParameterTable.cpp) -set_target_properties( - avrPowerswitchParameters${MCU_TYPE_FOR_FILENAME} PROPERTIES - COMPILE_DEFINITIONS POWERSWITCH_PARAMETERS - ) -add_avr_library( - avrDCMotorParameters - DCMotorParameterTable.cpp - ) +set_target_properties(avrPowerswitchParameters${MCU_TYPE_FOR_FILENAME} + PROPERTIES COMPILE_DEFINITIONS POWERSWITCH_PARAMETERS) +add_avr_library(avrDCMotorParameters DCMotorParameterTable.cpp) -set_target_properties( - avrDCMotorParameters${MCU_TYPE_FOR_FILENAME} PROPERTIES - COMPILE_DEFINITIONS DCMOTOR_PARAMETERS - ) +set_target_properties(avrDCMotorParameters${MCU_TYPE_FOR_FILENAME} + PROPERTIES COMPILE_DEFINITIONS DCMOTOR_PARAMETERS) -add_avr_library( - avrShutterCtrlParameters - ShutterCtrlParameterTable.cpp - ) +add_avr_library(avrShutterCtrlParameters ShutterCtrlParameterTable.cpp) -set_target_properties( - avrShutterCtrlParameters${MCU_TYPE_FOR_FILENAME} PROPERTIES - COMPILE_DEFINITIONS SHUTTERCTRL_PARAMETERS - ) +set_target_properties(avrShutterCtrlParameters${MCU_TYPE_FOR_FILENAME} + PROPERTIES COMPILE_DEFINITIONS SHUTTERCTRL_PARAMETERS) -add_avr_library( - avrWorkMeterParameters - WorkMeterParameterTable.cpp - ) +add_avr_library(avrWorkMeterParameters WorkMeterParameterTable.cpp) -set_target_properties( - avrWorkMeterParameters${MCU_TYPE_FOR_FILENAME} PROPERTIES - COMPILE_DEFINITIONS WORKMETER_PARAMETERS - ) +set_target_properties(avrWorkMeterParameters${MCU_TYPE_FOR_FILENAME} + PROPERTIES COMPILE_DEFINITIONS WORKMETER_PARAMETERS) diff --git a/Platform/CMakeLists.txt b/Platform/CMakeLists.txt index 9a78286..e21fba9 100644 --- a/Platform/CMakeLists.txt +++ b/Platform/CMakeLists.txt @@ -1,57 +1,25 @@ -##################################################################### +# ############################################################################## # simple AVR library -##################################################################### -add_avr_library( - avrPtf - ParameterHandler.cpp - PersistentStorage.cpp - ) +# ############################################################################## +add_avr_library(avrPtf ParameterHandler.cpp PersistentStorage.cpp) -set_target_properties( - avrPtf${MCU_TYPE_FOR_FILENAME} PROPERTIES - COMPILE_DEFINITIONS DCMOTOR_PARAMETERS -) +set_target_properties(avrPtf${MCU_TYPE_FOR_FILENAME} + PROPERTIES COMPILE_DEFINITIONS DCMOTOR_PARAMETERS) # -# -# -add_avr_library( - avrPS-Ptf - ParameterHandler.cpp - PersistentStorage.cpp - ) +add_avr_library(avrPS-Ptf ParameterHandler.cpp PersistentStorage.cpp) -set_target_properties( - avrPS-Ptf${MCU_TYPE_FOR_FILENAME} PROPERTIES - COMPILE_DEFINITIONS POWERSWITCH_PARAMETERS -) -# -# +set_target_properties(avrPS-Ptf${MCU_TYPE_FOR_FILENAME} + PROPERTIES COMPILE_DEFINITIONS POWERSWITCH_PARAMETERS) # -add_avr_library( - avrSC-Ptf - ParameterHandler.cpp - PersistentStorage.cpp - ) +add_avr_library(avrSC-Ptf ParameterHandler.cpp PersistentStorage.cpp) -set_target_properties( - avrSC-Ptf${MCU_TYPE_FOR_FILENAME} PROPERTIES - COMPILE_DEFINITIONS SHUTTERCTRL_PARAMETERS -) +set_target_properties(avrSC-Ptf${MCU_TYPE_FOR_FILENAME} + PROPERTIES COMPILE_DEFINITIONS SHUTTERCTRL_PARAMETERS) # -# -# -add_avr_library( - avrWM-Ptf - ParameterHandler.cpp - PersistentStorage.cpp - RFIDReader/RFIDReaderHandler.cpp - ErrorHandler/ErrorHandler.cpp - ) - -set_target_properties( - avrWM-Ptf${MCU_TYPE_FOR_FILENAME} PROPERTIES - COMPILE_DEFINITIONS WORKMETER_PARAMETERS -) +add_avr_library(avrWM-Ptf ParameterHandler.cpp PersistentStorage.cpp + RFIDReader/RFIDReaderHandler.cpp ErrorHandler/ErrorHandler.cpp) +set_target_properties(avrWM-Ptf${MCU_TYPE_FOR_FILENAME} + PROPERTIES COMPILE_DEFINITIONS WORKMETER_PARAMETERS)