~aleteoryx/muditaos

7fa175ddaf0ee4fabe0cae8570f19ceaee7540c1 — Marek Niepieklo 4 years ago 3e57a07
[EGD-7434] Handle settings for USB stack in USB submodule CMakeLists.txt

Move out USB related flag definitions from
cmake/modules/ProjectConfig.cmake to usb_stack/CMakeLists.txt
2 files changed, 1 insertions(+), 10 deletions(-)

M cmake/modules/ProjectConfig.cmake
M third-party/usb_stack
M cmake/modules/ProjectConfig.cmake => cmake/modules/ProjectConfig.cmake +0 -9
@@ 41,13 41,6 @@ endif()

# add Mudita USB Vendor/Product IDs
option(MUDITA_USB_ID "Enables using Mudita registered USB Vendor ID and Pure Phone USB Product ID" ON)
if (MUDITA_USB_ID)
    set (USB_DEVICE_VENDOR_ID  0x3310 CACHE INTERNAL "Sets USB_DEVICE_VENDOR_ID to Mudita Vendor ID")
    set (USB_DEVICE_PRODUCT_ID 0x0100 CACHE INTERNAL "Sets USB_DEVICE_PRODUCT_ID to Mudita Pure Product ID")
else()
    set (USB_DEVICE_VENDOR_ID  0x045E CACHE INTERNAL "Sets USB_DEVICE_VENDOR_ID to Microsoft Vendor ID")
    set (USB_DEVICE_PRODUCT_ID 0x0622 CACHE INTERNAL "Sets USB_DEVICE_PRODUCT_ID to Windows MTP Simulator Product ID")
endif()

#Config options described in README.md
set(PROJECT_CONFIG_DEFINITIONS


@@ 57,8 50,6 @@ set(PROJECT_CONFIG_DEFINITIONS
        SYSTEM_VIEW_ENABLED=${SYSTEM_VIEW_ENABLED}
        USBCDC_ECHO_ENABLED=${USBCDC_ECHO_ENABLED}
        LOG_LUART_ENABLED=${LOG_LUART_ENABLED}
        USB_DEVICE_VENDOR_ID=${USB_DEVICE_VENDOR_ID}
        USB_DEVICE_PRODUCT_ID=${USB_DEVICE_PRODUCT_ID}
        MAGIC_ENUM_RANGE_MAX=256
        CACHE INTERNAL ""
        )

M third-party/usb_stack => third-party/usb_stack +1 -1
@@ 1,1 1,1 @@
Subproject commit df703b04e8073dc52a6f13ce34230c6b2e47bbc4
Subproject commit 1dda16454f437f5bb11e675f3725619cebd37f1c