Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMake: Fix error that prevented re-build #13895

Merged
merged 1 commit into from
Nov 12, 2020
Merged

CMake: Fix error that prevented re-build #13895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions tools/cmake/app.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")

Expand Down