From d7f55e500f5baffb74be6aabe2171c15eacc3a0d Mon Sep 17 00:00:00 2001
From: Hui Zhang <zhtclz@foxmail.com>
Date: Fri, 4 Mar 2022 11:47:01 +0000
Subject: [PATCH] reorder gflags, gtest, glog

---
 speechx/CMakeLists.txt | 26 +++++++++++++-------------
 speechx/build.sh       |  5 ++---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/speechx/CMakeLists.txt b/speechx/CMakeLists.txt
index 13131adc..ffd4c559 100644
--- a/speechx/CMakeLists.txt
+++ b/speechx/CMakeLists.txt
@@ -24,7 +24,7 @@ get_filename_component(fc_patch "fc_patch" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR
 set(FETCHCONTENT_BASE_DIR ${fc_patch})
 
 # compiler option
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -pthread -fPIC -O0 -Wall -g")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++14 -pthread -fPIC -O0 -Wall -g")
 
 ###############################################################################
 # Option Configurations
@@ -41,7 +41,16 @@ option(TEST_DEBUG "option for debug" OFF)
 # FetchContent_MakeAvailable()
 # include_directories()
 
-# ABSEIL-CPP, need before gtest
+# gflags
+include(gflags)
+
+# glog
+include(glog)
+
+# gtest
+include(gtest)
+
+# ABSEIL-CPP
 include(absl)
 
 # libsndfile, not work
@@ -61,15 +70,6 @@ include(kenlm)
 add_dependencies(kenlm eigen boost)
 
 
-# gflags
-include(gflags)
-
-# glog
-include(glog)
-
-# gtest
-#include(gtest)
-
 # openfst
 set(openfst_SOURCE_DIR ${fc_patch}/openfst-src)
 set(openfst_BINARY_DIR ${fc_patch}/openfst-build)
@@ -158,8 +158,6 @@ include_directories(${OpenBLAS_INSTALL_PREFIX}/include)
 # gfortan dir in the docker.
 link_directories(/usr/local/gcc-8.2/lib64)
 
-add_subdirectory(speechx)
-
 ###############################################################################
 # Add local library
 ###############################################################################
@@ -171,3 +169,5 @@ add_subdirectory(speechx)
 #add_library(lib_name STATIC file.cc)
 #target_link_libraries(lib_name item0 item1)
 #add_dependencies(lib_name depend-target)
+
+add_subdirectory(speechx)
\ No newline at end of file
diff --git a/speechx/build.sh b/speechx/build.sh
index 2f28d8ce..a5c93267 100755
--- a/speechx/build.sh
+++ b/speechx/build.sh
@@ -5,8 +5,7 @@
 # https://www.paddlepaddle.org.cn/documentation/docs/zh/install/docker/linux-docker.html
 
 boost_SOURCE_DIR=$PWD/fc_patch/boost-src
-if [ ! -d ${boost_SOURCE_DIR} ]; then
-  wget -c https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz 
+if [ ! -d ${boost_SOURCE_DIR} ]; then wget -c https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz 
   tar xzfv boost_1_75_0.tar.gz
   mkdir -p $PWD/fc_patch
   mv boost_1_75_0 ${boost_SOURCE_DIR} 
@@ -20,7 +19,7 @@ fi
 mkdir -p build
 cd build
 
-cmake .. -DBOOST_ROOT:STRING=${boost_SOURCE_DIR}
+cmake .. -DBOOST_ROOT:STRING=${boost_SOURCE_DIR} --target clean
 
 make