From 33d3d2084403fd34b79c835d2f2fe04f6cd8f738 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期三, 13 九月 2023 09:33:54 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR add

---
 funasr/runtime/onnxruntime/CMakeLists.txt |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/funasr/runtime/onnxruntime/CMakeLists.txt b/funasr/runtime/onnxruntime/CMakeLists.txt
index 7948186..637d765 100644
--- a/funasr/runtime/onnxruntime/CMakeLists.txt
+++ b/funasr/runtime/onnxruntime/CMakeLists.txt
@@ -1,10 +1,14 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 
-project(FunASRonnx)
+project(FunASROnnx)
+
+option(ENABLE_GLOG "Whether to build glog" ON)
 
 # set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD 14 CACHE STRING "The C++ version to be used.")
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 
 include(TestBigEndian)
 test_big_endian(BIG_ENDIAN)
@@ -23,11 +27,19 @@
 	endif()
 ELSE()
     link_directories(${ONNXRUNTIME_DIR}/lib)
+    link_directories(${FFMPEG_DIR}/lib)
 endif()
 
-include_directories(${PROJECT_SOURCE_DIR}/kaldi-native-fbank)
+include_directories(${PROJECT_SOURCE_DIR}/third_party/kaldi-native-fbank)
+include_directories(${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include)
 
-add_subdirectory("./third_party/yaml-cpp")
-add_subdirectory(kaldi-native-fbank/kaldi-native-fbank/csrc)
+if(ENABLE_GLOG)
+    include_directories(${PROJECT_SOURCE_DIR}/third_party/glog)
+    set(BUILD_TESTING OFF)
+    add_subdirectory(third_party/glog)
+endif()
+
+add_subdirectory(third_party/yaml-cpp)
+add_subdirectory(third_party/kaldi-native-fbank/kaldi-native-fbank/csrc)
 add_subdirectory(src)
-add_subdirectory(tester)
+add_subdirectory(bin)

--
Gitblit v1.9.1