From 62a0394fdd43bfdddf49790eabb9daee144a652d Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 10 May 2024 17:02:48 +0800 Subject: [PATCH] =?UTF-8?q?2024.5.10-=E5=8E=BB=E9=99=A4ITN=E7=9A=84?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake-linux/gflags.cmake | 3 ++- cmake-linux/glog.cmake | 2 +- cmake-linux/grpc.cmake | 3 ++- cmake-linux/openfst.cmake | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake-linux/gflags.cmake b/cmake-linux/gflags.cmake index 51ff01a..c13b422 100644 --- a/cmake-linux/gflags.cmake +++ b/cmake-linux/gflags.cmake @@ -3,7 +3,8 @@ set(GFLAGS_BUILD_DIR ${LIB_BASE_DIR}/gflags-build) if(REBUILD) message(STATUS "${BoldGreen}Install GFLAGS to: ${GFLAGS_BUILD_DIR}${ColourReset}") execute_process( - COMMAND mkdir gflags-build && cmake -DGFLAGS_NAMESPACE=google -DCMAKE_CXX_FLAGS=-fPIC -S ${GFLAGS_ROOT_DIR} -B ${GFLAGS_BUILD_DIR} + COMMAND rm -rf gflags-build && mkdir gflags-build && + cmake -DGFLAGS_NAMESPACE=google -DCMAKE_CXX_FLAGS=-fPIC -S ${GFLAGS_ROOT_DIR} -B ${GFLAGS_BUILD_DIR} WORKING_DIRECTORY ${LIB_BASE_DIR}) execute_process( COMMAND cmake --build . -j4 diff --git a/cmake-linux/glog.cmake b/cmake-linux/glog.cmake index 925ab45..e08e633 100644 --- a/cmake-linux/glog.cmake +++ b/cmake-linux/glog.cmake @@ -7,7 +7,7 @@ set(GLOG_BUILD_DIR ${LIB_BASE_DIR}/glog-build) if(REBUILD) message(STATUS "${BoldGreen}Install glog to: ${GLOG_BUILD_DIR}${ColourReset}") execute_process( - COMMAND mkdir glog-build + COMMAND rm -rf glog-build && mkdir glog-build WORKING_DIRECTORY ${LIB_BASE_DIR}) execute_process( COMMAND cmake -DGFLAGS_NAMESPACE=google -DCMAKE_CXX_FLAGS=-fPIC -S ${GLOG_ROOT_DIR} -B . diff --git a/cmake-linux/grpc.cmake b/cmake-linux/grpc.cmake index c508bd2..d903720 100644 --- a/cmake-linux/grpc.cmake +++ b/cmake-linux/grpc.cmake @@ -4,7 +4,8 @@ set(grpc_build_dir "${LIB_BASE_DIR}/grpc-build") if(REBUILD) # install grpc - execute_process(COMMAND mkdir -p ${grpc_build_dir}) + execute_process(COMMAND rm -rf ${grpc_build_dir} && mkdir -p ${grpc_build_dir}) + message(STATUS "${BoldGreen}Install grpc third party library${ColourReset}") execute_process( COMMAND cmake diff --git a/cmake-linux/openfst.cmake b/cmake-linux/openfst.cmake index 8f5f339..a68cdce 100644 --- a/cmake-linux/openfst.cmake +++ b/cmake-linux/openfst.cmake @@ -6,13 +6,14 @@ set(openfst_BUILD "${LIB_BASE_DIR}/openfst-build") if(REBUILD) message(STATUS "${BoldGreen}Install openfst: ${GLOG_BUILD_DIR}${ColourReset}") #./configure --prefix=${openfst_SOURCE_DIR}/build --enable-static --disable-shared --with-pic + execute_process(COMMAND rm -rf ${openfst_BUILD} && mkdir -p ${openfst_BUILD}) # patch补丁必须打,不然会报glog无法动态识别这个库的方法,导致链接不成功。 execute_process( COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/patch/openfst ${LIB_BASE_DIR}/openfst-src WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) execute_process( - COMMAND ./configure --prefix=${openfst_BUILD} + COMMAND ./configure --prefix=${openfst_BUILD} --with-pic WORKING_DIRECTORY ${LIB_BASE_DIR}/openfst-src) execute_process( COMMAND cmake --build . --target install