From 43881b61ff8d0eef588c642ce74141f2c56d80c1 Mon Sep 17 00:00:00 2001
From: Administrator <xbirdman@126.com>
Date: Fri, 17 May 2024 17:43:03 +0800
Subject: [PATCH] =?UTF-8?q?2024.5.16=20=E6=B5=8B=E8=AF=95=E6=95=B4?=
 =?UTF-8?q?=E4=BD=93=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kaldi/CMakeLists.txt               | 3 ++-
 kaldi/base/kaldi-error.h           | 5 +----
 kaldi/fstext/determinize-lattice.h | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/kaldi/CMakeLists.txt b/kaldi/CMakeLists.txt
index 68a3ecd..50121f6 100644
--- a/kaldi/CMakeLists.txt
+++ b/kaldi/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 
 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
 
 add_library(kaldi-util
diff --git a/kaldi/base/kaldi-error.h b/kaldi/base/kaldi-error.h
index e4c9ad3..b272c75 100644
--- a/kaldi/base/kaldi-error.h
+++ b/kaldi/base/kaldi-error.h
@@ -17,10 +17,8 @@
 #ifndef KALDI_BASE_KALDI_ERROR_H_
 #define KALDI_BASE_KALDI_ERROR_H_ 1
 #include "kaldi-types.h"
-
-namespace kaldi {
-#ifndef _LOGGING_H_
 #include "glog/logging.h"
+namespace kaldi {
 #define KALDI_WARN \
   google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING).stream()
 #define KALDI_ERR \
@@ -30,7 +28,6 @@ namespace kaldi {
 #define KALDI_VLOG(v) VLOG(v)
 
 #define KALDI_ASSERT(condition) CHECK(condition)
-#endif
 /***** PROGRAM NAME AND VERBOSITY LEVEL *****/
 
 /// Called by ParseOptions to set base name (no directory) of the executing
diff --git a/kaldi/fstext/determinize-lattice.h b/kaldi/fstext/determinize-lattice.h
index 8a34071..a7cd87f 100644
--- a/kaldi/fstext/determinize-lattice.h
+++ b/kaldi/fstext/determinize-lattice.h
@@ -26,7 +26,7 @@
 #include <set>
 #include <vector>
 #include "fstext/lattice-weight.h"
-
+#include "base/kaldi-types.h"
 namespace fst {
 
 /// \addtogroup fst_extensions