From a30bc6c1d7ddab94f460f06ac94929aa41498dfc Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 16 May 2024 17:06:12 +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 | 1 + cmake-linux/openfst.cmake | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92de3ba..c2a7729 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,7 @@ endif() include(openfst) #wenet个人项目内容 include_directories( + ${OPENFST_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/kaldi ) diff --git a/cmake-linux/openfst.cmake b/cmake-linux/openfst.cmake index c3b64d7..2036211 100644 --- a/cmake-linux/openfst.cmake +++ b/cmake-linux/openfst.cmake @@ -66,7 +66,6 @@ endif () find_path(OPENFST_INCLUDE_DIR fst/fst.h PATHS ${OPENFST_ROOT}/include) -include_directories(${OPENFST_INCLUDE_DIR}) find_path(OPENFST_BINARY_DIR fstsymbols PATHS ${OPENFST_ROOT}/bin) find_path(OPENFST_LIBRARY_DIR libfst.so PATHS ${OPENFST_ROOT}/lib) set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${OPENFST_LIBRARY_DIR}) @@ -76,8 +75,8 @@ 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) -message("${BoldGreen}Openfst FOUND\n - OPENFST_INCLUDE_DIR: ${OPENFST_INCLUDE_DIR}\n - OPENFST_BINARY_DIR: ${OPENFST_BINARY_DIR}\n - OPENFST_LIBRARY_DIR: ${OPENFST_LIBRARY_DIR}\n +message("${BoldGreen} + OPENFST_INCLUDE_DIR: ${OPENFST_INCLUDE_DIR} + OPENFST_BINARY_DIR: ${OPENFST_BINARY_DIR} + OPENFST_LIBRARY_DIR: ${OPENFST_LIBRARY_DIR} IMPORTED OPENFST_LIBRARYS: ${OPENFST_LIBRARYS}${ColourReset}") \ No newline at end of file