Skip to content

Commit eef158d

Browse files
committed
🩹 (cmake): Fix MBED_CONFIG_PATH by passing TARGET_BOARD value to cmake
1 parent 31b7394 commit eef158d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ add_compile_options(
2323
$<$<COMPILE_LANGUAGE:CXX>:-Wno-register>
2424
)
2525

26+
message(STATUS "Target board: ${TARGET_BOARD}")
27+
2628
# Set ROOT_DIR, MBED_PATH, MBED_CONFIG_PATH
2729
set(ROOT_DIR ${CMAKE_CURRENT_LIST_DIR})
2830
set(MBED_PATH ${ROOT_DIR}/extern/mbed-os CACHE INTERNAL "")
29-
set(MBED_CONFIG_PATH ${ROOT_DIR}/.mbedbuild CACHE INTERNAL "")
31+
set(MBED_CONFIG_PATH ${ROOT_DIR}/cmake_build/${TARGET_BOARD}/develop/GCC_ARM/ CACHE INTERNAL "")
3032

3133
# For convenience, define useful variables
3234
set(LIBS_DIR ${ROOT_DIR}/libs)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ config_target: mkdir_config
8383
config_cmake: mkdir_build
8484
@echo ""
8585
@echo "🏃 Running cmake configuration script for target $(TARGET_BOARD) 📝"
86-
@cmake -S . -B $(TARGET_BUILD_DIR) -GNinja -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
86+
@cmake -S . -B $(TARGET_BUILD_DIR) -GNinja -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DTARGET_BOARD=$(TARGET_BOARD)
8787

8888
#
8989
# MARK: - Tests targets

0 commit comments

Comments
 (0)