Skip to content

Commit 54a3073

Browse files
committed
Update travis to call mbedtools with build commandline argument to avoid configure step
- Update CMake minimum version required from 3.18.2 to 3.19.0 - Replace mbed-os source path MBED_ROOT with MBED_PATH in CMakeLists.txt
1 parent 006819e commit 54a3073

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,8 @@ matrix:
6262
- >-
6363
git clone --depth=1 --single-branch https://github.com/ARMmbed/mbed-os.git;
6464
- >-
65-
mbedtools configure -t GCC_ARM -m ${TARGET_NAME};
66-
mkdir -p build
6765
script:
68-
- cd build && cmake .. -GNinja -DCMAKE_BUILD_TYPE=${PROFILE} && cmake --build .
66+
- mbedtools build -t GCC_ARM -m ${TARGET_NAME} -b ${PROFILE}
6967
- ccache -s
7068

7169
- <<: *cmake-build-test

CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
cmake_minimum_required(VERSION 3.18.2 FATAL_ERROR)
4+
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
55

6-
# TODO: @mbed-os-tools MBED_ROOT and MBED_CONFIG_PATH should probably come from mbedtools
7-
set(MBED_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")
6+
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/mbed-os CACHE INTERNAL "")
87
set(MBED_CONFIG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.mbedbuild CACHE INTERNAL "")
98
set(APP_TARGET mbed-os-example-blinky)
109

11-
include(${MBED_ROOT}/tools/cmake/app.cmake)
10+
include(${MBED_PATH}/tools/cmake/app.cmake)
1211

13-
add_subdirectory(${MBED_ROOT})
12+
add_subdirectory(${MBED_PATH})
1413

1514
add_executable(${APP_TARGET})
1615

0 commit comments

Comments
 (0)