diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index e2d9bc0..8790a2e 100644 --- a/bin/CMakeLists.txt +++ b/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) diff --git a/bin/decoder_main.cc b/bin/decoder_main.cc index 44dd8c2..5687043 100644 --- a/bin/decoder_main.cc +++ b/bin/decoder_main.cc @@ -23,6 +23,7 @@ #include "utils/thread_pool.h" #include "utils/timer.h" #include "utils/wn_utils.h" +#include DEFINE_bool(simulate_streaming, false, "simulate streaming input"); DEFINE_bool(output_nbest, false, "output n-best of decode result"); diff --git a/bin/label_checker_main.cc b/bin/label_checker_main.cc index 5c460f7..7a921bb 100644 --- a/bin/label_checker_main.cc +++ b/bin/label_checker_main.cc @@ -21,7 +21,7 @@ #include "frontend/wav.h" #include "utils/flags.h" #include "utils/wn_string.h" - +#include DEFINE_string(text, "", "kaldi style text input file"); DEFINE_string(wav_scp, "", "kaldi style wav scp"); DEFINE_double(is_penalty, 1.0, diff --git a/cmake-linux/gflags.cmake b/cmake-linux/gflags.cmake index b85823d..092b9a9 100644 --- a/cmake-linux/gflags.cmake +++ b/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) \ No newline at end of file diff --git a/grpc/CMakeLists.txt b/grpc/CMakeLists.txt index a2eb5f4..2a7bc23 100644 --- a/grpc/CMakeLists.txt +++ b/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)