2024.5.16 测试整体构建

bin/CMakeLists.txt

@@ -1,9 +1,10 @@
+include_directories(${GFLAGS_BUILD_DIR}/include)
 add_executable(decoder_main decoder_main.cc)
 target_link_libraries(decoder_main PUBLIC decoder)
 if(IPEX)
   target_link_libraries(decoder_main PUBLIC "${TORCH_IPEX_LIBRARIES}")
 endif()
-message(STATUS "gflags_LIBRARIES: ${gflags_LIBRARIES}")
+message(STATUS "GFLAGS_BUILD_DIR: ${GFLAGS_BUILD_DIR}")
 
 add_executable(label_checker_main label_checker_main.cc)
 target_link_libraries(label_checker_main PUBLIC decoder)

bin/decoder_main.cc

@@ -23,6 +23,7 @@
 #include "utils/thread_pool.h"
 #include "utils/timer.h"
 #include "utils/wn_utils.h"
+#include <gflags/gflags.h>
 
 DEFINE_bool(simulate_streaming, false, "simulate streaming input");
 DEFINE_bool(output_nbest, false, "output n-best of decode result");

bin/label_checker_main.cc

@@ -21,7 +21,7 @@
 #include "frontend/wav.h"
 #include "utils/flags.h"
 #include "utils/wn_string.h"
-
+#include <gflags/gflags.h>
 DEFINE_string(text, "", "kaldi style text input file");
 DEFINE_string(wav_scp, "", "kaldi style wav scp");
 DEFINE_double(is_penalty, 1.0,

cmake-linux/gflags.cmake

@@ -12,6 +12,12 @@ if(NOT EXISTS ${grpc_build_dir})
 endif()
 
 set(gflags_DIR ${LIB_BASE_DIR}/gflags-build)
-find_package(gflags REQUIRED CONFIG HINTS ${GFLAGS_BUILD_DIR})
+find_package(gflags CONFIG REQUIRED HINTS ${GFLAGS_BUILD_DIR})
+find_library(GFLAGS_LIBRARY NAMES gflags PATHS ${GFLAGS_BUILD_DIR}/lib)
+find_library(GFLAGS_LIBRARY_NOTHREADS NAMES gflags_nothreads PATHS ${GFLAGS_BUILD_DIR}/lib)
 include_directories(${GFLAGS_BUILD_DIR}/include)
-list(APPEND third_party_libraries gflags)
+
+
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(gflags DEFAULT_MSG
+        GFLAGS_LIBRARY GFLAGS_LIBRARY_NOTHREADS)

grpc/CMakeLists.txt

@@ -22,8 +22,7 @@ add_library(wenet_grpc STATIC
   grpc_client.cc
   grpc_server.cc
   wenet.pb.cc
-  wenet.grpc.pb.cc
-)
+  wenet.grpc.pb.cc)
 target_link_libraries(wenet_grpc PUBLIC ${REFLECTION}
-        ${GRPC_GRPCPP} gflags_nothreads_static
+        ${GRPC_GRPCPP}
         ${PROTOBUF_LIBPROTOBUF} decoder)