From 44017bd2b46dda4449df2163e38ec372bcdac092 Mon Sep 17 00:00:00 2001
From: Administrator <xbirdman@126.com>
Date: Thu, 9 May 2024 16:51:29 +0800
Subject: [PATCH] =?UTF-8?q?2024.5.9-=E6=97=A0fetch=5Fcontent=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt            |  8 +++-----
 cmake-linux/openfst.cmake | 18 ++++++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63af0ef..4de738e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
 project(wenet VERSION 0.1)
 # 测试模块参数设置
 option(GRPC "build with gRPC" OFF)
@@ -12,13 +13,10 @@ option(CLEAN_CMAKE_CACHE "更换Build目录运行需要清空缓存" OFF)
 string(ASCII 27 Esc)
 set(ColourReset "${Esc}[m")
 set(BoldGreen   "${Esc}[1;32m")
-set(Red         "${Esc}[31m")
+set(BoldRed     "${Esc}[31m")
 
-include(FetchContent)
-set(FETCHCONTENT_QUIET OFF)
 set(third_party_libraries)
 set(LIB_BASE_DIR /root/projects/temp_xiaoke/asr_runtime/lib_files)
-set(FETCHCONTENT_BASE_DIR ${LIB_BASE_DIR})
 #清空缓存
 if(CLEAN_CMAKE_CACHE)
     message(STATUS "Cleaning CMakeCache.txt")
@@ -46,6 +44,6 @@ if(ONNX)
 endif()
 if(OPENFST)
     include(openfst)
-    add_executable(fst_main bin_test_env/fst.cc)
+    add_executable(fst_main "fst.cc")
     target_link_libraries(fst_main PRIVATE ${third_party_libraries})
 endif()
diff --git a/cmake-linux/openfst.cmake b/cmake-linux/openfst.cmake
index db7497f..cf93e7a 100644
--- a/cmake-linux/openfst.cmake
+++ b/cmake-linux/openfst.cmake
@@ -31,7 +31,6 @@ if(TARGET gflags)
 endif()
 set(WITH_GFLAGS OFF CACHE BOOL "whether build glog with gflags" FORCE)
 include(glog)
-message(STATUS "${BoldGreen}Find Package glog: ${glog_FOUND}${ColourReset}")
 # 下面这堆关键字是防止cmake出一堆无关的提示
 if(NOT GRAPH_TOOLS)
     set(HAVE_BIN OFF CACHE BOOL "Build the fst binaries" FORCE)
@@ -48,15 +47,14 @@ set(HAVE_LOOKAHEAD OFF CACHE BOOL "Build lookahead" FORCE)
 set(HAVE_NGRAM OFF CACHE BOOL "Build ngram" FORCE)
 set(HAVE_SPECIAL OFF CACHE BOOL "Build special" FORCE)
 
-find_package(openfst REQUIRED CONFIG HINTS ${openfst_ROOT})
-message(STATUS "${BoldGreen}Find Package openfst: ${openfst_FOUND}${ColourReset}")
-
 include_directories(${openfst_ROOT}/src/include)
 
-message(STATUS "${BoldGreen}openfst_BINARY_DIR: ${openfst_BINARY_DIR}${ColourReset}")
-
-add_dependencies(fst ${third_party_libraries})
-
-target_link_libraries(fst PUBLIC gflags_nothreads_static glog dl)
+if (EXISTS ${openfst_BUILD}/src/lib/libfst.so)
+    add_library(fst SHARED IMPORTED)
+    set_property(TARGET fst PROPERTY IMPORTED_LOCATION ${openfst_BUILD}/src/lib/libfst.so)
+    message(STATUS "${BoldGreen}Find Library libfst.so: ${openfst_BUILD}/src/lib/${ColourReset}")
+else ()
+    message(FATAL_ERROR "${BoldRed}Can't find openfst library from: ${openfst_BUILD}/src/lib ${ColourReset}")
+endif ()
 
-list(APPEND third_party_libraries fst)
\ No newline at end of file
+list(APPEND third_party_libraries fst gflags_nothreads_static glog dl)
\ No newline at end of file