Browse Source

2024.5.16 测试整体构建

master
Administrator 1 year ago
parent
commit
43881b61ff
3 changed files with 4 additions and 6 deletions
  1. +2
    -1
      kaldi/CMakeLists.txt
  2. +1
    -4
      kaldi/base/kaldi-error.h
  3. +1
    -1
      kaldi/fstext/determinize-lattice.h

+ 2
- 1
kaldi/CMakeLists.txt

@ -1,7 +1,8 @@
cmake_minimum_required(VERSION 3.10 FATAL_ERROR) cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
project(kaldi) project(kaldi)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -pthread -fPIC -w")
# include_directories() is called in the root CMakeLists.txt.test.bak1.bak # include_directories() is called in the root CMakeLists.txt.test.bak1.bak
add_library(kaldi-util add_library(kaldi-util

+ 1
- 4
kaldi/base/kaldi-error.h

@ -17,10 +17,8 @@
#ifndef KALDI_BASE_KALDI_ERROR_H_ #ifndef KALDI_BASE_KALDI_ERROR_H_
#define KALDI_BASE_KALDI_ERROR_H_ 1 #define KALDI_BASE_KALDI_ERROR_H_ 1
#include "kaldi-types.h" #include "kaldi-types.h"
namespace kaldi {
#ifndef _LOGGING_H_
#include "glog/logging.h" #include "glog/logging.h"
namespace kaldi {
#define KALDI_WARN \ #define KALDI_WARN \
google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING).stream() google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING).stream()
#define KALDI_ERR \ #define KALDI_ERR \
@ -30,7 +28,6 @@ namespace kaldi {
#define KALDI_VLOG(v) VLOG(v) #define KALDI_VLOG(v) VLOG(v)
#define KALDI_ASSERT(condition) CHECK(condition) #define KALDI_ASSERT(condition) CHECK(condition)
#endif
/***** PROGRAM NAME AND VERBOSITY LEVEL *****/ /***** PROGRAM NAME AND VERBOSITY LEVEL *****/
/// Called by ParseOptions to set base name (no directory) of the executing /// Called by ParseOptions to set base name (no directory) of the executing

+ 1
- 1
kaldi/fstext/determinize-lattice.h

@ -26,7 +26,7 @@
#include <set> #include <set>
#include <vector> #include <vector>
#include "fstext/lattice-weight.h" #include "fstext/lattice-weight.h"
#include "base/kaldi-types.h"
namespace fst { namespace fst {
/// \addtogroup fst_extensions /// \addtogroup fst_extensions

Loading…
Cancel
Save