From 69a188e28ad3beb8128328bb12bb6103801d2e64 Mon Sep 17 00:00:00 2001
From: Administrator <xbirdman@126.com>
Date: Sat, 18 May 2024 21:21:49 +0800
Subject: [PATCH] =?UTF-8?q?2024.5.16=20=E6=B5=8B=E8=AF=95=E6=95=B4?=
 =?UTF-8?q?=E4=BD=93=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt           | 10 +---------
 bin/CMakeLists.txt       |  4 ++--
 cmake-linux/gflags.cmake |  4 ++--
 cmake-linux/glog.cmake   |  4 ++--
 frontend/wav.h           |  2 +-
 grpc/CMakeLists.txt      |  3 ---
 6 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e1e4e2..8ce74d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,17 +12,9 @@ set(LIB_BASE_DIR /root/CXX_ENVS/wenet_runtime)
 set(third_party_libraries)
 option(GRPC "whether to build with gRPC" ON)
 option(ONNX "whether to build with ONNX" ON)
-option(CLEAN_CMAKE_CACHE "是否清空cmake缓存重新构建" ON)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-linux)
-#清空缓存
-if(CLEAN_CMAKE_CACHE)
-    message(STATUS "Cleaning CMakeCache.txt")
-    execute_process(
-            COMMAND find . -name "CMakeCache*" -exec rm -rf {} \;
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-endif ()
+
 # Model Option
 if(ONNX)
     include(onnx)
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 0b01c92..a22334f 100644
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -22,9 +22,9 @@ endif()
 
 if(GRPC)
   add_executable(grpc_server_main grpc_server_main.cc)
-  target_link_libraries(grpc_server_main PUBLIC wenet_grpc)
+  target_link_libraries(grpc_server_main PUBLIC wenet_grpc ${GFLAGS_LIBRARIES})
   add_executable(grpc_client_main grpc_client_main.cc)
-  target_link_libraries(grpc_client_main PUBLIC wenet_grpc)
+  target_link_libraries(grpc_client_main PUBLIC wenet_grpc ${GFLAGS_LIBRARIES})
 endif()
 
 if(HTTP)
diff --git a/cmake-linux/gflags.cmake b/cmake-linux/gflags.cmake
index 092b9a9..69082aa 100644
--- a/cmake-linux/gflags.cmake
+++ b/cmake-linux/gflags.cmake
@@ -1,6 +1,6 @@
 set(GFLAGS_ROOT_DIR ${LIB_BASE_DIR}/gflags-src)
 set(GFLAGS_BUILD_DIR ${LIB_BASE_DIR}/gflags-build)
-if(NOT EXISTS ${grpc_build_dir})
+function(GFLAGS_INSTALL DEST)
     message(STATUS "${BoldGreen}Install GFLAGS to: ${GFLAGS_BUILD_DIR}${ColourReset}")
     execute_process(COMMAND  mkdir -p "${GFLAGS_BUILD_DIR}")
     execute_process(COMMAND
@@ -9,7 +9,7 @@ if(NOT EXISTS ${grpc_build_dir})
     execute_process(
             COMMAND cmake --build . -j4
             WORKING_DIRECTORY ${GFLAGS_BUILD_DIR})
-endif()
+endfunction()
 
 set(gflags_DIR ${LIB_BASE_DIR}/gflags-build)
 find_package(gflags CONFIG REQUIRED HINTS ${GFLAGS_BUILD_DIR})
diff --git a/cmake-linux/glog.cmake b/cmake-linux/glog.cmake
index e9b21c9..c5c540d 100644
--- a/cmake-linux/glog.cmake
+++ b/cmake-linux/glog.cmake
@@ -4,7 +4,7 @@
 
 set(GLOG_ROOT_DIR ${LIB_BASE_DIR}/glog-src)
 set(GLOG_BUILD_DIR ${LIB_BASE_DIR}/glog-build)
-if(NOT EXISTS ${GLOG_BUILD_DIR})
+function(GLOG_INSTALL DEST)
     message(STATUS "${BoldGreen}Install glog to: ${GLOG_BUILD_DIR}${ColourReset}")
     execute_process(COMMAND mkdir -p "${GLOG_BUILD_DIR}")
     execute_process(
@@ -14,7 +14,7 @@ if(NOT EXISTS ${GLOG_BUILD_DIR})
             COMMAND cmake --build . -j4
             WORKING_DIRECTORY ${GLOG_BUILD_DIR})
     message(STATUS "${BoldGreen}Install glog to: ${GLOG_BUILD_DIR}${ColourReset}")
-endif()
+endfunction()
 find_package(glog REQUIRED CONFIG HINTS ${GLOG_ROOT_DIR})
 message(STATUS "${BoldGreen}Find Package glog: ${glog_FOUND}${ColourReset}")
 include_directories(${GLOG_BUILD_DIR})
diff --git a/frontend/wav.h b/frontend/wav.h
index 551cf11..0876b69 100644
--- a/frontend/wav.h
+++ b/frontend/wav.h
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include "glog/logging.h"
 #include <string>
 
 namespace wenet {
diff --git a/grpc/CMakeLists.txt b/grpc/CMakeLists.txt
index 2a7bc23..719fc77 100644
--- a/grpc/CMakeLists.txt
+++ b/grpc/CMakeLists.txt
@@ -15,9 +15,6 @@ add_custom_command(
     --plugin=protoc-gen-grpc=${GRPC_BINARY_DIR}/grpc_cpp_plugin
     wenet.proto)
 
-# grpc_server/client
-link_directories(${protobuf_BINARY_DIR}/lib)
-
 add_library(wenet_grpc STATIC
   grpc_client.cc
   grpc_server.cc