From 0145af0f413e919f36af48385a5307df32ae77c3 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 18 May 2024 16:41:47 +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 --- bin/label_checker_main.cc | 9 ++++++++- cmake-linux/glog.cmake | 2 +- cmake-linux/openfst.cmake | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/label_checker_main.cc b/bin/label_checker_main.cc index 7a921bb..380f72e 100644 --- a/bin/label_checker_main.cc +++ b/bin/label_checker_main.cc @@ -21,7 +21,14 @@ #include "frontend/wav.h" #include "utils/flags.h" #include "utils/wn_string.h" -#include +#ifdef GFLAGS_GFLAGS_H_ +std::cout << "gflags已经进行了include" << std::endl; +#else +#include "gflags/gflags.h" +std::cout << "gflags没有进行include" << std::endl; +#endif + + 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/glog.cmake b/cmake-linux/glog.cmake index 499fa42..e9b21c9 100644 --- a/cmake-linux/glog.cmake +++ b/cmake-linux/glog.cmake @@ -21,4 +21,4 @@ include_directories(${GLOG_BUILD_DIR}) include_directories(${GLOG_ROOT_DIR}/src) link_directories(${GLOG_BUILD_DIR}) # glog::glog is imported target -list(APPEND third_party_libraries glog::glog) \ No newline at end of file +find_library(GLOG_LIBRARY NAMES glog PATHS ${GLOG_BUILD_DIR}) \ No newline at end of file diff --git a/cmake-linux/openfst.cmake b/cmake-linux/openfst.cmake index bba3459..cd97dd7 100644 --- a/cmake-linux/openfst.cmake +++ b/cmake-linux/openfst.cmake @@ -72,8 +72,7 @@ set(OPENFST_LIBRARYS fst gflags_nothreads_static glog dl) #验证库和文件是否被找到 include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Openfst DEFAULT_MSG - OPENFST_INCLUDE_DIR OPENFST_BINARY_DIR OPENFST_LIBRARY_DIR - fst gflags_nothreads_static glog dl) + OPENFST_INCLUDE_DIR OPENFST_BINARY_DIR fst GFLAGS_LIBRARY_NOTHREADS GFLAGS_LIBRARY GLOG_LIBRARY) message("${BoldGreen} OPENFST_INCLUDE_DIR: ${OPENFST_INCLUDE_DIR} OPENFST_BINARY_DIR: ${OPENFST_BINARY_DIR}