From fc151999cc926b24217024e97d710b201b519a11 Mon Sep 17 00:00:00 2001 From: YangZhou Date: Thu, 23 Mar 2023 14:36:35 +0800 Subject: [PATCH] fix abuiild error --- runtime/CMakeLists.txt | 11 ++++++----- runtime/cmake/gflags.cmake | 3 ++- runtime/engine/asr/recognizer/CMakeLists.txt | 2 +- runtime/engine/common/frontend/CMakeLists.txt | 4 ++-- runtime/engine/kaldi/fstbin/CMakeLists.txt | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 4a515ff7f..a1d50b787 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -14,11 +14,6 @@ set(PPS_VERSION_MINOR 0) set(PPS_VERSION_PATCH 0) set(PPS_VERSION "${PPS_VERSION_MAJOR}.${PPS_VERSION_MINOR}.${PPS_VERSION_PATCH}") -# fc_patch dir -set(FETCHCONTENT_QUIET off) -get_filename_component(fc_patch "fc_patch" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}") -set(FETCHCONTENT_BASE_DIR ${fc_patch}) - # compiler option # Keep the same with openfst, -fPIC or -fpic set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++14 -pthread -fPIC -O0 -Wall -g -ldl") @@ -50,6 +45,12 @@ set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/install) include(FetchContent) include(ExternalProject) + +# fc_patch dir +set(FETCHCONTENT_QUIET off) +get_filename_component(fc_patch "fc_patch" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}") +set(FETCHCONTENT_BASE_DIR ${fc_patch}) + ############################################################################### # Option Configurations ############################################################################### diff --git a/runtime/cmake/gflags.cmake b/runtime/cmake/gflags.cmake index 8ddf66356..aa0248ba4 100644 --- a/runtime/cmake/gflags.cmake +++ b/runtime/cmake/gflags.cmake @@ -9,5 +9,6 @@ FetchContent_MakeAvailable(gflags) # openfst need include_directories(${gflags_BINARY_DIR}/include) +link_directories(${gflags_BINARY_DIR}) -install(FILES ${gflags_BINARY_DIR}/libgflags_nothreads.a DESTINATION lib) \ No newline at end of file +#install(FILES ${gflags_BINARY_DIR}/libgflags_nothreads.a DESTINATION lib) diff --git a/runtime/engine/asr/recognizer/CMakeLists.txt b/runtime/engine/asr/recognizer/CMakeLists.txt index 54cf95e42..12491f67b 100644 --- a/runtime/engine/asr/recognizer/CMakeLists.txt +++ b/runtime/engine/asr/recognizer/CMakeLists.txt @@ -18,7 +18,7 @@ set(TEST_BINS foreach(bin_name IN LISTS TEST_BINS) add_executable(${bin_name} ${CMAKE_CURRENT_SOURCE_DIR}/${bin_name}.cc) target_include_directories(${bin_name} PRIVATE ${SPEECHX_ROOT} ${SPEECHX_ROOT}/kaldi) - target_link_libraries(${bin_name} recognizer nnet decoder fst utils gflags glog kaldi-base kaldi-matrix kaldi-util) + target_link_libraries(${bin_name} recognizer nnet decoder fst utils libgflags_nothreads.so glog kaldi-base kaldi-matrix kaldi-util) target_compile_options(${bin_name} PRIVATE ${PADDLE_COMPILE_FLAGS}) target_include_directories(${bin_name} PRIVATE ${pybind11_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}) target_link_libraries(${bin_name} ${PYTHON_LIBRARIES} ${PADDLE_LINK_FLAGS} -ldl) diff --git a/runtime/engine/common/frontend/CMakeLists.txt b/runtime/engine/common/frontend/CMakeLists.txt index 5d78e7ead..e63049d3b 100644 --- a/runtime/engine/common/frontend/CMakeLists.txt +++ b/runtime/engine/common/frontend/CMakeLists.txt @@ -26,5 +26,5 @@ foreach(bin_name IN LISTS BINS) add_executable(${bin_name} ${CMAKE_CURRENT_SOURCE_DIR}/${bin_name}.cc) target_include_directories(${bin_name} PRIVATE ${SPEECHX_ROOT} ${SPEECHX_ROOT}/kaldi) # https://github.com/Kitware/CMake/blob/v3.1.0/Modules/FindThreads.cmake#L207 - target_link_libraries(${bin_name} PUBLIC frontend base utils kaldi-util gflags Threads::Threads extern_glog) -endforeach() \ No newline at end of file + target_link_libraries(${bin_name} PUBLIC frontend base utils kaldi-util libgflags_nothreads.so Threads::Threads extern_glog) +endforeach() diff --git a/runtime/engine/kaldi/fstbin/CMakeLists.txt b/runtime/engine/kaldi/fstbin/CMakeLists.txt index 05d0501f3..f53be578d 100644 --- a/runtime/engine/kaldi/fstbin/CMakeLists.txt +++ b/runtime/engine/kaldi/fstbin/CMakeLists.txt @@ -11,5 +11,5 @@ fsttablecompose foreach(binary IN LISTS BINS) add_executable(${binary} ${CMAKE_CURRENT_SOURCE_DIR}/${binary}.cc) target_include_directories(${binary} PRIVATE ${SPEECHX_ROOT} ${SPEECHX_ROOT}/kaldi) - target_link_libraries(${binary} PUBLIC kaldi-fstext glog gflags fst dl) + target_link_libraries(${binary} PUBLIC kaldi-fstext glog libgflags_nothreads.so fst dl) endforeach()