Skip to content

Commit a70edcd

Browse files
committed
CMake: Fix error that prevented re-build
Promote MBED_TOOLCHAIN_FILE_USED to cache variable so its previous state can be recalled when re-building. This is because CMAKE_TOOLCHAIN_FILE is also a cache variable and its value is set on first run when it has not been set.
1 parent 6068428 commit a70edcd

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

tools/cmake/app.cmake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ endif()
99

1010
include(${MBED_CONFIG_PATH}/mbed_config.cmake)
1111

12-
set(MBED_TOOLCHAIN_FILE_USED FALSE)
13-
1412
# Set default toolchain file
15-
if(NOT CMAKE_TOOLCHAIN_FILE)
16-
set(MBED_TOOLCHAIN_FILE_USED TRUE)
13+
if(NOT CMAKE_TOOLCHAIN_FILE OR MBED_TOOLCHAIN_FILE_USED)
14+
set(MBED_TOOLCHAIN_FILE_USED TRUE CACHE INTERNAL "")
1715

1816
set(CMAKE_TOOLCHAIN_FILE "${MBED_PATH}/tools/cmake/toolchain.cmake" CACHE INTERNAL "")
1917

0 commit comments

Comments
 (0)