2024.5.16 测试整体构建

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)

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)

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})

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})

frontend/wav.h

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include "glog/logging.h"
 #include <string>
 
 namespace wenet {

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