From a4a8e90c52825b057793171920eba2f9afb8fbdc Mon Sep 17 00:00:00 2001
From: Administrator <xbirdman@126.com>
Date: Mon, 13 May 2024 15:16:00 +0800
Subject: [PATCH] =?UTF-8?q?2024.5.10-=E5=8E=BB=E9=99=A4ITN=E7=9A=84?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmake-linux/grpc.cmake    |  6 ++----
 cmake-linux/openfst.cmake | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/cmake-linux/grpc.cmake b/cmake-linux/grpc.cmake
index ddaadc0..c2635e8 100644
--- a/cmake-linux/grpc.cmake
+++ b/cmake-linux/grpc.cmake
@@ -1,11 +1,9 @@
 # On how to build grpc, you may refer to https://github.com/grpc/grpc
 # grpc version : v1.37.1
 set(grpc_build_dir "${LIB_BASE_DIR}/grpc-build")
-
 if(NOT EXISTS ${grpc_build_dir})
     # install grpc
     execute_process(COMMAND mkdir -p "${grpc_build_dir}")
-
     message(STATUS "${BoldGreen}Install grpc third party library${ColourReset}")
     execute_process(
             COMMAND cmake
@@ -25,10 +23,10 @@ if(NOT EXISTS ${grpc_build_dir})
             -B ${grpc_build_dir}
             WORKING_DIRECTORY ${grpc_build_dir})
     execute_process(
-            COMMAND cmake --build . -j4
+            COMMAND make -j6
             WORKING_DIRECTORY ${grpc_build_dir})
     execute_process(
-            COMMAND cmake --install .
+            COMMAND make install
             WORKING_DIRECTORY ${grpc_build_dir})
     execute_process(COMMAND cp -rf ${LIB_BASE_DIR}/grpc-src/third_party/abseil-cpp/absl ${grpc_build_dir}/include)
     execute_process(
diff --git a/cmake-linux/openfst.cmake b/cmake-linux/openfst.cmake
index fbd44b2..60d1c79 100644
--- a/cmake-linux/openfst.cmake
+++ b/cmake-linux/openfst.cmake
@@ -21,26 +21,26 @@ if(NOT EXISTS ${openfst_BUILD})
     # patch补丁必须打，不然会报glog无法动态识别这个库的方法，导致链接不成功。
     execute_process(
             COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/patch/openfst ${LIB_BASE_DIR}/openfst-src
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            RESULT_VARIABLE configure_result1)
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
     message(STATUS "${BoldGreen}configure openfst${ColourReset}")
     #./configure --prefix=${openfst_SOURCE_DIR}/build --enable-static --disable-shared --with-pic
     execute_process(
             COMMAND ./configure --prefix=${openfst_BUILD} --with-pic
-            WORKING_DIRECTORY ${openfst_ROOT}
-            RESULT_VARIABLE configure_result)
-    message(FATAL_ERROR "${BoldRed}openfst项目构建不成功！${openfst_BUILD} ${ColourReset}")
-    if(configure_result)
-        message(FATAL_ERROR "${BoldRed}openfst项目构建不成功！ ${ColourReset}")
-    endif ()
+            WORKING_DIRECTORY ${openfst_ROOT}            )
+
     message(STATUS "${BoldGreen}copy openfst patch done!${ColourReset}")
     execute_process(
-            COMMAND cmake --build . --target install
-            WORKING_DIRECTORY ${openfst_ROOT})
+            COMMAND make -j8
+            WORKING_DIRECTORY ${openfst_ROOT}
+            RESULT_VARIABLE configure_result
+    )
     execute_process(
-            COMMAND cmake --install .
+            COMMAND make --install
             WORKING_DIRECTORY ${openfst_ROOT})
+    if(configure_result)
+        message(FATAL_ERROR "${BoldRed}openfst项目构建不成功！ ${ColourReset}")
+    endif ()
 endif()
 
 # gflags和glog现在被我安装到了系统盘下/usr/lib/x86_64-linux-gnu