Externalize OpenThread build dependency option into boards.txt

Author: soburi

boards.txt

@@ -23,7 +23,7 @@ nrf52840_pca10056.build.variant=nrf52840_pca10056
 nrf52840_pca10056.menu.network.802154=IEEE802.15.4
 nrf52840_pca10056.menu.network.802154.build.network_conf=-DOVERLAY_APPEND_NETWORK={runtime.platform.path}/variants/{build.variant}/overlay-802154.conf
 nrf52840_pca10056.menu.network.ot=OpenThread
-nrf52840_pca10056.menu.network.ot.build.network_conf=-DOVERLAY_APPEND_NETWORK={runtime.platform.path}/variants/{build.variant}/overlay-ot.conf -DDEPENDENCY_APPEND_OT=ot
+nrf52840_pca10056.menu.network.ot.build.network_conf=-DOVERLAY_APPEND_NETWORK={runtime.platform.path}/variants/{build.variant}/overlay-ot.conf -DDEPENDENCY_APPEND_OT=ot -DEXTERNAL_PROJECT_PATH_OPENTHREAD={build.system.path}/openthread
 nrf52840_pca10056.menu.network.bt=Bluetooth
 nrf52840_pca10056.menu.network.bt.build.network_conf=-DOVERLAY_APPEND_NETWORK={runtime.platform.path}/variants/{build.variant}/overlay-bt.conf
 nrf52840_pca10056.menu.uartlog.enable=Enable

platform.txt

@@ -33,7 +33,7 @@ build.zephyr.env.compiler=ZEPHYR_TOOLCHAIN_VARIANT=zephyr ZEPHYR_SDK_INSTALL_DIR
 build.zephyr.env.compiler.macosx=ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb GNUARMEMB_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi
 build.zephyr.env=ZEPHYR_BASE={build.system.path}/zephyr {build.zephyr.env.compiler}
 build.zephyr.args.arduino=-DARDUINO_BUILD_PATH={build.path} -DARDUINO_VARIANT_PATH={build.variant.path} -DARDUINO_PREPROC_SOURCE={source_file} -DARDUINO_PREPROC_TARGET={preprocessed_file_path}
-build.zephyr.args.board=-DBOARD={build.variant} -DEXTERNAL_PROJECT_PATH_OPENTHREAD={build.system.path}/openthread
+build.zephyr.args.board=-DBOARD={build.variant}
 build.zephyr.args.configs={build.network_conf} {build.uartlog_conf}
 build.zephyr.args={build.zephyr.args.arduino} {build.zephyr.args.board} {build.zephyr.args.configs}
 intiki.cmd={runtime.tools.intiki.path}/intiki

system/support/build.cmake

@@ -56,12 +56,18 @@ if(NOT WIN32)
   endif()
 endif()
 
+if(NOT ${EXTERNAL_PROJECT_PATH_OPENTHREAD} STREQUAL "")
+  set(external_ot_path -DEXTERNAL_PROJECT_PATH_OPENTHREAD=${EXTERNAL_PROJECT_PATH_OPENTHREAD})
+else()
+  set(external_ot_path "")
+endif()
+
 if(EXISTS ${build_dir}/_cmakefile/.NOT_CHANGED )
   file(REMOVE ${build_dir}/_cmakefile/.NOT_CHANGED )
 else()
   if("${ARDUINO_PREPROC_TARGET}" STREQUAL "{preprocessed_file_path}")
     execute_process(
-      COMMAND ${CMAKE_COMMAND} -GNinja -DBOARD=${BOARD} -DCONF_FILE=${conffile_opt} -DEXTERNAL_PROJECT_PATH_OPENTHREAD=${EXTERNAL_PROJECT_PATH_OPENTHREAD} ${preproc_flag} -DARDUINO_EXTRA_DEPENDENCIES=${extradeps_opt} _cmakefile
+      COMMAND ${CMAKE_COMMAND} -GNinja -DBOARD=${BOARD} -DCONF_FILE=${conffile_opt} ${external_ot_path} ${preproc_flag} -DARDUINO_EXTRA_DEPENDENCIES=${extradeps_opt} _cmakefile
       WORKING_DIRECTORY ${build_dir}
     )
   else()