ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13895 from hugueskamba/hk_cmake_fix_subsequent_runs 

CMake: Fix error that prevented re-build
pull/13904/head
Martin Kojtal 2020-11-12 08:19:45 +00:00 committed by GitHub
parent f5f638952b a70edcda0a
commit 9c40d1fcd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/cmake/app.cmake
View File

@ -9,11 +9,9 @@ endif()
include(${MBED_CONFIG_PATH}/mbed_config.cmake)
set(MBED_TOOLCHAIN_FILE_USED FALSE)
# Set default toolchain file
if(NOT CMAKE_TOOLCHAIN_FILE)
set(MBED_TOOLCHAIN_FILE_USED TRUE)
if(NOT CMAKE_TOOLCHAIN_FILE OR MBED_TOOLCHAIN_FILE_USED)
set(MBED_TOOLCHAIN_FILE_USED TRUE CACHE INTERNAL "")
set(CMAKE_TOOLCHAIN_FILE "${MBED_PATH}/tools/cmake/toolchain.cmake" CACHE INTERNAL "")