From 2bdc2333ed4dfee9f3943a0b46285451119e92c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Fri, 25 Jan 2019 09:21:44 +0000 Subject: [PATCH] Fix to includes order for ChibiOS-Contrib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Following nanoframework/nf-interpreter#1179. Signed-off-by: José Simões #ALL# --- CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/CMakeLists.txt | 2 +- CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/CMakeLists.txt | 2 +- CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/CMakeLists.txt | 2 +- CMSIS-OS/ChibiOS/ST_NUCLEO144_F412ZG_NF/CMakeLists.txt | 2 +- CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/CMakeLists.txt | 7 ++++++- CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/CMakeLists.txt | 2 +- CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/CMakeLists.txt | 2 +- CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/CMakeLists.txt | 2 +- 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/CMakeLists.txt b/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/CMakeLists.txt index f63113c8..f4adab85 100644 --- a/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/CMakeLists.txt +++ b/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/CMakeLists.txt @@ -133,8 +133,8 @@ include_directories( ${WireProtocol_INCLUDE_DIRS} ${CHIBIOS_INCLUDE_DIRS} - ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${ChibiOSnfOverlay_INCLUDE_DIRS} + ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${TARGET_CMSIS_COMMON_INCLUDE_DIRS} ${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS} diff --git a/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/CMakeLists.txt b/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/CMakeLists.txt index 0217ec70..18d50d0c 100644 --- a/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/CMakeLists.txt +++ b/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/CMakeLists.txt @@ -133,8 +133,8 @@ include_directories( ${WireProtocol_INCLUDE_DIRS} ${CHIBIOS_INCLUDE_DIRS} - ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${ChibiOSnfOverlay_INCLUDE_DIRS} + ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${TARGET_CMSIS_COMMON_INCLUDE_DIRS} ${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS} diff --git a/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/CMakeLists.txt b/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/CMakeLists.txt index e044f292..12ea07e8 100644 --- a/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/CMakeLists.txt +++ b/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/CMakeLists.txt @@ -133,8 +133,8 @@ include_directories( ${WireProtocol_INCLUDE_DIRS} ${CHIBIOS_INCLUDE_DIRS} - ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${ChibiOSnfOverlay_INCLUDE_DIRS} + ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${TARGET_CMSIS_COMMON_INCLUDE_DIRS} ${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS} diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO144_F412ZG_NF/CMakeLists.txt b/CMSIS-OS/ChibiOS/ST_NUCLEO144_F412ZG_NF/CMakeLists.txt index 4342ae2a..d9b463e2 100644 --- a/CMSIS-OS/ChibiOS/ST_NUCLEO144_F412ZG_NF/CMakeLists.txt +++ b/CMSIS-OS/ChibiOS/ST_NUCLEO144_F412ZG_NF/CMakeLists.txt @@ -141,8 +141,8 @@ include_directories( ${WireProtocol_INCLUDE_DIRS} ${CHIBIOS_INCLUDE_DIRS} - ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${ChibiOSnfOverlay_INCLUDE_DIRS} + ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${TARGET_CMSIS_COMMON_INCLUDE_DIRS} ${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS} diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/CMakeLists.txt b/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/CMakeLists.txt index bdc910da..2711bb4f 100644 --- a/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/CMakeLists.txt +++ b/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/CMakeLists.txt @@ -30,6 +30,11 @@ find_package(NF_CoreCLR REQUIRED) ####################################### # optional +# ChibiOS contrib repo +if(CHIBIOS_CONTRIB_REQUIRED) + find_package(ChibiOS-Contrib REQUIRED) +endif() + # nF feature: debugger if(NF_FEATURE_DEBUGGER) find_package(NF_Debugger REQUIRED) @@ -151,8 +156,8 @@ include_directories( ${WireProtocol_INCLUDE_DIRS} ${CHIBIOS_INCLUDE_DIRS} - ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${ChibiOSnfOverlay_INCLUDE_DIRS} + ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${TARGET_CMSIS_COMMON_INCLUDE_DIRS} ${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS} diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/CMakeLists.txt b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/CMakeLists.txt index 1f7dd64a..2033b04c 100644 --- a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/CMakeLists.txt +++ b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/CMakeLists.txt @@ -133,8 +133,8 @@ include_directories( ${WireProtocol_INCLUDE_DIRS} ${CHIBIOS_INCLUDE_DIRS} - ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${ChibiOSnfOverlay_INCLUDE_DIRS} + ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${TARGET_CMSIS_COMMON_INCLUDE_DIRS} ${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS} diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/CMakeLists.txt b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/CMakeLists.txt index cacd0619..cb7b7b4b 100644 --- a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/CMakeLists.txt +++ b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/CMakeLists.txt @@ -133,8 +133,8 @@ include_directories( ${WireProtocol_INCLUDE_DIRS} ${CHIBIOS_INCLUDE_DIRS} - ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${ChibiOSnfOverlay_INCLUDE_DIRS} + ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${TARGET_CMSIS_COMMON_INCLUDE_DIRS} ${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS} diff --git a/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/CMakeLists.txt b/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/CMakeLists.txt index e010530e..8fb5f60b 100644 --- a/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/CMakeLists.txt +++ b/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/CMakeLists.txt @@ -128,8 +128,8 @@ include_directories( ${WireProtocol_INCLUDE_DIRS} ${CHIBIOS_INCLUDE_DIRS} - ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${ChibiOSnfOverlay_INCLUDE_DIRS} + ${CHIBIOS_CONTRIB_INCLUDE_DIRS} ${TARGET_CMSIS_COMMON_INCLUDE_DIRS} ${TARGET_CHIBIOS_COMMON_INCLUDE_DIRS}