diff options
| author | Christiaan Janssen <christiaan.janssen@qt.io> | 2021-11-30 08:48:20 +0100 |
|---|---|---|
| committer | Christiaan Janssen <christiaan.janssen@qt.io> | 2021-12-01 08:59:51 +0000 |
| commit | da192fb1e862ddc0e6c3a37f507c1a0fc1d236b1 (patch) | |
| tree | 19287dc3192f961f2678d1b629bf3b62effddfd6 | |
| parent | b6fe15294eb9bed910f6c610685c84b12300d6b6 (diff) | |
| download | qt-creator-da192fb1e862ddc0e6c3a37f507c1a0fc1d236b1.tar.gz | |
McuSupport: adjust more cmake variables to the 2.0 API
* added missing mapping for RGL_DIR
* remapped TVII_GRAPHICS_DRIVER_DIR and EK_RA6M3G_FSP_PATH
* fix duplicated EVK_MIMXRT1170_FREERTOS_PATH (second one should be IMXRT1050_FREERTOS_DIR)
Task-number: UL-5070
Change-Id: Ic2a69df6e5ba9a0c05f360e5e800d4c19ec966f4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/mcusupport/mcusupportcmakemapper.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/mcusupport/mcusupportcmakemapper.cpp b/src/plugins/mcusupport/mcusupportcmakemapper.cpp index 8b0e05db63..34cd578259 100644 --- a/src/plugins/mcusupport/mcusupportcmakemapper.cpp +++ b/src/plugins/mcusupport/mcusupportcmakemapper.cpp @@ -40,12 +40,15 @@ static const QHash<QString, QString> &envVarToCMakeVarMapping() {"STM32Cube_FW_F4_SDK_PATH","QUL_BOARD_SDK_DIR"}, {"STM32Cube_FW_L4_SDK_PATH","QUL_BOARD_SDK_DIR"}, {"STM32Cube_FW_H7_SDK_PATH","QUL_BOARD_SDK_DIR"}, + {"RGL_DIR", "QUL_BOARD_SDK_DIR"}, + {"TVII_GRAPHICS_DRIVER_DIR", "QUL_BOARD_SDK_DIR"}, + {"EK_RA6M3G_FSP_PATH", "QUL_BOARD_SDK_DIR"}, {"ARMGCC_DIR", "QUL_TARGET_TOOLCHAIN_DIR"}, {"IAR_ARM_COMPILER_DIR", "QUL_TARGET_TOOLCHAIN_DIR"}, {"GHS_COMPILER_DIR", "QUL_TARGET_TOOLCHAIN_DIR"}, {"GHS_ARM_COMPILER_DIR", "QUL_TARGET_TOOLCHAIN_DIR"}, {"EVK_MIMXRT1170_FREERTOS_PATH","FREERTOS_DIR"}, - {"EVK_MIMXRT1170_FREERTOS_PATH","FREERTOS_DIR"}, + {"IMXRT1050_FREERTOS_DIR","FREERTOS_DIR"}, {"IMXRT1064_FREERTOS_DIR","FREERTOS_DIR"}, {"IMXRT595_FREERTOS_DIR","FREERTOS_DIR"}, {"STM32F7_FREERTOS_DIR", "FREERTOS_DIR"}, @@ -53,10 +56,8 @@ static const QHash<QString, QString> &envVarToCMakeVarMapping() {"RenesasFlashProgrammer_PATH", "RENESAS_FLASH_PROGRAMMER_PATH"}, {"MCUXpressoIDE_PATH", "MCUXPRESSO_IDE_PATH"}, {"JLINK_PATH", "JLINK_PATH"}, - {"TVII_GRAPHICS_DRIVER_DIR", "TVII_GRAPHICS_DRIVER_DIR"}, {"CYPRESS_AUTO_FLASH_UTILITY_DIR", "CYPRESS_AUTO_FLASH_UTILITY_DIR"}, {"EK_RA6M3G_E2_PROJECT_PATH", "EK_RA6M3G_E2_PROJECT_PATH"}, - {"EK_RA6M3G_FSP_PATH", "EK_RA6M3G_FSP_PATH"}, }; return mapping; } |