diff --git a/CMakeLists.txt b/CMakeLists.txt index 9892dc5..2cd8867 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,7 @@ endif() include(openfst) #wenet个人项目内容 include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} # ${CMAKE_CURRENT_SOURCE_DIR}/kaldi ) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index b5a276e..3ecfc09 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,3 +1,5 @@ +message(-----------------${OPENFST_INCLUDE_DIR}--------------------) +include_directories(${OPENFST_INCLUDE_DIR}) add_library(utils STATIC wn_string.cc wn_utils.cc diff --git a/utils/wn_log.h b/utils/wn_log.h deleted file mode 100644 index b5aaaa8..0000000 --- a/utils/wn_log.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2021 Mobvoi Inc (Binbin Zhang) -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef UTILS_LOG_H_ -#define UTILS_LOG_H_ -// Because openfst is a dynamic library compiled with gflags/glog, we must use -// the gflags/glog from openfst to avoid them linked both statically and -// dynamically into the executable. -#ifndef FST_LOG_H_ -#include "fst/wn_log.h" -#endif -#endif // UTILS_LOG_H_ diff --git a/utils/wn_string.cc b/utils/wn_string.cc index b6a9f6e..b66c7cc 100644 --- a/utils/wn_string.cc +++ b/utils/wn_string.cc @@ -18,7 +18,6 @@ #include #include -#include "wn_log.h" #include "wn_utils.h" namespace wenet { diff --git a/utils/wn_utils.cc b/utils/wn_utils.cc index 5577a0b..33174fc 100644 --- a/utils/wn_utils.cc +++ b/utils/wn_utils.cc @@ -13,7 +13,6 @@ // limitations under the License. #include "wn_utils.h" -#include "wn_log.h" #include #include diff --git a/utils/wn_utils.h b/utils/wn_utils.h index f9957c0..764aa8c 100644 --- a/utils/wn_utils.h +++ b/utils/wn_utils.h @@ -14,7 +14,9 @@ #ifndef UTILS_UTILS_H_ #define UTILS_UTILS_H_ - +#ifndef FST_LOG_H_ +#include "fst/log.h" +#endif #include #include #include