Skip to content

Commit 948e6dd

Browse files
authored
update top level cmake to use default toolchain (#148)
1 parent 8dedeca commit 948e6dd

File tree

5 files changed

+40
-30
lines changed

5 files changed

+40
-30
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"cmake.configureOnOpen": false
2+
"cmake.configureOnOpen": false,
3+
"git.ignoreLimitWarning": true
34
}

MXChip/AZ3166/CMakeLists.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33

4-
cmake_minimum_required(VERSION 3.10)
5-
6-
project(mxchip_azure_iot C ASM)
7-
4+
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
85
set(CMAKE_C_STANDARD 99)
96

10-
set(GSG_BASE_DIR ${PROJECT_SOURCE_DIR}/../..)
7+
set(GSG_BASE_DIR ${CMAKE_SOURCE_DIR}/../..)
118
set(CORE_SRC_DIR ${GSG_BASE_DIR}/core/src)
129
set(CORE_LIB_DIR ${GSG_BASE_DIR}/core/lib)
1310

11+
# Set the toolchain if not defined
12+
if(NOT CMAKE_TOOLCHAIN_FILE)
13+
set(CMAKE_TOOLCHAIN_FILE "${GSG_BASE_DIR}/cmake/arm-gcc-cortex-m4.cmake")
14+
endif()
15+
1416
list(APPEND CMAKE_MODULE_PATH ${GSG_BASE_DIR}/cmake)
15-
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
17+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
1618

1719
include(utilities)
1820

19-
message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
21+
# Define the Project
22+
project(mxchip_azure_iot C ASM)
2023

21-
# Disable common networking component, STM has it's own
24+
# Disable common networking component, MXCHIP has it's own
2225
set(DISABLE_COMMON_NETWORK true)
2326

2427
add_subdirectory(${CORE_SRC_DIR} core_src)

Microchip/ATSAME54-XPRO/CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33

4-
cmake_minimum_required(VERSION 3.10)
5-
project(atsame54_azure_iot C ASM)
6-
4+
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
75
set(CMAKE_C_STANDARD 99)
86

9-
set(GSG_BASE_DIR ${PROJECT_SOURCE_DIR}/../..)
7+
set(GSG_BASE_DIR ${CMAKE_SOURCE_DIR}/../..)
108
set(CORE_SRC_DIR ${GSG_BASE_DIR}/core/src)
119
set(CORE_LIB_DIR ${GSG_BASE_DIR}/core/lib)
1210

13-
list(APPEND CMAKE_MODULE_PATH ${GSG_BASE_DIR}/cmake)
11+
# Set the toolchain if not defined
12+
if(NOT CMAKE_TOOLCHAIN_FILE)
13+
set(CMAKE_TOOLCHAIN_FILE "${GSG_BASE_DIR}/cmake/arm-gcc-cortex-m4.cmake")
14+
endif()
1415

15-
include(utilities)
16+
include(${GSG_BASE_DIR}/cmake/utilities.cmake)
1617

17-
message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
18+
# Define the Project
19+
project(atsame54_azure_iot C ASM)
1820

1921
add_subdirectory(${CORE_SRC_DIR} core_src)
2022
add_subdirectory(lib)

NXP/MIMXRT1060-EVK/CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33

4-
cmake_minimum_required(VERSION 3.10)
5-
project(mimxrt1060_azure_iot C ASM)
6-
4+
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
75
set(CMAKE_C_STANDARD 99)
86

9-
set(GSG_BASE_DIR ${PROJECT_SOURCE_DIR}/../..)
7+
set(GSG_BASE_DIR ${CMAKE_SOURCE_DIR}/../..)
108
set(CORE_SRC_DIR ${GSG_BASE_DIR}/core/src)
119
set(CORE_LIB_DIR ${GSG_BASE_DIR}/core/lib)
1210

13-
list(APPEND CMAKE_MODULE_PATH ${GSG_BASE_DIR}/cmake)
11+
# Set the toolchain if not defined
12+
if(NOT CMAKE_TOOLCHAIN_FILE)
13+
set(CMAKE_TOOLCHAIN_FILE "${GSG_BASE_DIR}/cmake/arm-gcc-cortex-m7.cmake")
14+
endif()
1415

15-
include(utilities)
16+
include(${GSG_BASE_DIR}/cmake/utilities.cmake)
1617

17-
message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
18+
# Define the Project
19+
project(mimxrt1060_azure_iot C ASM)
1820

1921
add_subdirectory(${CORE_SRC_DIR} core_src)
2022
add_subdirectory(lib)

STMicroelectronics/STM32L4_L4+/CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33

4-
cmake_minimum_required(VERSION 3.10)
5-
project(stm32l4_azure_iot C ASM)
6-
4+
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
75
set(CMAKE_C_STANDARD 99)
86

9-
set(GSG_BASE_DIR ${PROJECT_SOURCE_DIR}/../..)
7+
set(GSG_BASE_DIR ${CMAKE_SOURCE_DIR}/../..)
108
set(CORE_SRC_DIR ${GSG_BASE_DIR}/core/src)
119
set(CORE_LIB_DIR ${GSG_BASE_DIR}/core/lib)
1210

13-
list(APPEND CMAKE_MODULE_PATH ${GSG_BASE_DIR}/cmake)
11+
# Set the toolchain if not defined
12+
if(NOT CMAKE_TOOLCHAIN_FILE)
13+
set(CMAKE_TOOLCHAIN_FILE "${GSG_BASE_DIR}/cmake/arm-gcc-cortex-m4.cmake")
14+
endif()
1415

15-
include(utilities)
16+
include(${GSG_BASE_DIR}/cmake/utilities.cmake)
1617

17-
message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
18+
# Define the Project
19+
project(stm32l4_azure_iot C ASM)
1820

1921
# Disable common networking component, STM has it's own
2022
set(DISABLE_COMMON_NETWORK true)

0 commit comments

Comments
 (0)