From 883d32356fc576b8fa7bab2765e4828c77a59222 Mon Sep 17 00:00:00 2001
From: Yakun Xu <xyk@google.com>
Date: Tue, 12 May 2020 17:50:17 +0800
Subject: [PATCH] [posix] ot-cli be indepedent of openthread-ncp-ftd (#4953)

---
 src/posix/CMakeLists.txt | 2 +-
 src/posix/cli.cmake      | 4 +++-
 tests/toranj/build.sh    | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/posix/CMakeLists.txt b/src/posix/CMakeLists.txt
index 259ab8baf..64f8b0abf 100644
--- a/src/posix/CMakeLists.txt
+++ b/src/posix/CMakeLists.txt
@@ -35,7 +35,7 @@ set(COMMON_INCLUDES
 )
 
 set(OT_READLINE "readline" CACHE STRING "set readline library name")
-set_property(CACHE OT_READLINE PROPERTY STRINGS "readline" "edit" "no")
+set_property(CACHE OT_READLINE PROPERTY STRINGS "readline" "edit")
 
 if(OT_READLINE)
     find_library(READLINE ${OT_READLINE})
diff --git a/src/posix/cli.cmake b/src/posix/cli.cmake
index 34036ba6c..86d659987 100644
--- a/src/posix/cli.cmake
+++ b/src/posix/cli.cmake
@@ -55,8 +55,10 @@ target_link_libraries(ot-cli
     ${OT_PLATFORM_LIB}
     openthread-ftd
     ${OT_PLATFORM_LIB}
+    openthread-cli-ftd
+    openthread-hdlc
+    openthread-spinel-rcp
     mbedcrypto
-    openthread-ncp-ftd
     ${READLINE_LINK_LIBRARIES}
 )
 
diff --git a/tests/toranj/build.sh b/tests/toranj/build.sh
index fd15838ea..5e297e998 100755
--- a/tests/toranj/build.sh
+++ b/tests/toranj/build.sh
@@ -150,7 +150,7 @@ case ${build_config} in
         echo "===================================================================================================="
         echo "Building OpenThread (NCP/CLI for FTD/MTD/RCP mode) with simulation platform using cmake"
         echo "===================================================================================================="
-        cmake -GNinja -DOT_PLATFORM=simulation -DOT_COMPILE_WARNING_AS_ERROR=on \
+        cmake -GNinja -DOT_PLATFORM=simulation -DOT_COMPILE_WARNING_AS_ERROR=on -DOT_APP_CLI=off \
             -DOT_CONFIG=../tests/toranj/openthread-core-toranj-config-simulation.h . || die
         ninja || die
         ;;
@@ -159,7 +159,7 @@ case ${build_config} in
         echo "===================================================================================================="
         echo "Building OpenThread POSIX host platform using cmake"
         echo "===================================================================================================="
-        cmake -GNinja -DOT_PLATFORM=posix -DOT_COMPILE_WARNING_AS_ERROR=on \
+        cmake -GNinja -DOT_PLATFORM=posix -DOT_COMPILE_WARNING_AS_ERROR=on -DOT_APP_CLI=off \
             -DOT_CONFIG=../tests/toranj/openthread-core-toranj-config-posix.h . || die
         ninja || die
         ;;