Merge branch 'main' of https://github.com/alibaba-damo-academy/FunASR into ...

雾聪

2023-11-16 5297a2dc4b2f22c07b9bfd5aef6190efd51de0bb

 runtime/onnxruntime/CMakeLists.txt

@@ -20,12 +20,12 @@

# for onnxruntime
IF(WIN32)
#    file(REMOVE ${PROJECT_SOURCE_DIR}/third_party/glog/src/config.h 
#                ${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/export.h 
#                ${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/logging.h 
#                ${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/raw_logging.h 
#                ${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/stl_logging.h 
#                ${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/vlog_is_on.h)
    file(REMOVE ${PROJECT_SOURCE_DIR}/third_party/glog/src/config.h 
                ${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/export.h 
                ${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/logging.h 
                ${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/raw_logging.h 
                ${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/stl_logging.h 
                ${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/vlog_is_on.h)
ELSE()
    link_directories(${ONNXRUNTIME_DIR}/lib)
    link_directories(${FFMPEG_DIR}/lib)
@@ -55,7 +55,10 @@
    # with some patch to fix the make errors. 
    add_subdirectory(third_party/openfst)
    include_directories(${openfst_SOURCE_DIR}/src/include)
    
    if(WIN32)
    include_directories(${openfst_SOURCE_DIR}/src/lib)
    endif()

endif()

add_subdirectory(third_party/yaml-cpp)