From d1d6199dcc26cb6ef1f4ad1de60e6dfeeed24df3 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 10 May 2024 17:44:54 +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 | 4 ++-- cmake-linux/glog.cmake | 6 ++---- cmake-linux/grpc.cmake | 4 ++-- cmake-linux/openfst.cmake | 35 +++++++++++++++-------------------- 4 files changed, 21 insertions(+), 28 deletions(-) diff --git a/cmake-linux/gflags.cmake b/cmake-linux/gflags.cmake index 5b6d98b..e0e845b 100644 --- a/cmake-linux/gflags.cmake +++ b/cmake-linux/gflags.cmake @@ -1,8 +1,8 @@ set(GFLAGS_ROOT_DIR ${LIB_BASE_DIR}/gflags-src) set(GFLAGS_BUILD_DIR ${LIB_BASE_DIR}/gflags-build) -if(REBUILD) +if(NOT EXISTS ${grpc_build_dir}) message(STATUS "${BoldGreen}Install GFLAGS to: ${GFLAGS_BUILD_DIR}${ColourReset}") - execute_process(COMMAND rm -rf ${GFLAGS_BUILD_DIR} && mkdir ${GFLAGS_BUILD_DIR}) + execute_process(COMMAND mkdir -p "${GFLAGS_BUILD_DIR}") execute_process(COMMAND cmake -DGFLAGS_NAMESPACE=google -DCMAKE_CXX_FLAGS=-fPIC -S ${GFLAGS_ROOT_DIR} -B ${GFLAGS_BUILD_DIR} WORKING_DIRECTORY ${LIB_BASE_DIR}) diff --git a/cmake-linux/glog.cmake b/cmake-linux/glog.cmake index e08e633..a63baa4 100644 --- a/cmake-linux/glog.cmake +++ b/cmake-linux/glog.cmake @@ -4,11 +4,9 @@ set(GLOG_ROOT_DIR ${LIB_BASE_DIR}/glog-src) set(GLOG_BUILD_DIR ${LIB_BASE_DIR}/glog-build) -if(REBUILD) +if(NOT EXISTS ${GLOG_BUILD_DIR}) message(STATUS "${BoldGreen}Install glog to: ${GLOG_BUILD_DIR}${ColourReset}") - execute_process( - COMMAND rm -rf glog-build && mkdir glog-build - WORKING_DIRECTORY ${LIB_BASE_DIR}) + execute_process(COMMAND mkdir -p "${GLOG_BUILD_DIR}") execute_process( COMMAND cmake -DGFLAGS_NAMESPACE=google -DCMAKE_CXX_FLAGS=-fPIC -S ${GLOG_ROOT_DIR} -B . WORKING_DIRECTORY ${GLOG_BUILD_DIR}) diff --git a/cmake-linux/grpc.cmake b/cmake-linux/grpc.cmake index d903720..8ad4059 100644 --- a/cmake-linux/grpc.cmake +++ b/cmake-linux/grpc.cmake @@ -2,9 +2,9 @@ set(grpc_build_dir "${LIB_BASE_DIR}/grpc-build") -if(REBUILD) +if(NOT EXISTS ${grpc_build_dir}) # install grpc - execute_process(COMMAND rm -rf ${grpc_build_dir} && mkdir -p ${grpc_build_dir}) + execute_process(COMMAND mkdir -p "${grpc_build_dir}") message(STATUS "${BoldGreen}Install grpc third party library${ColourReset}") execute_process( diff --git a/cmake-linux/openfst.cmake b/cmake-linux/openfst.cmake index 87a57bc..c760cee 100644 --- a/cmake-linux/openfst.cmake +++ b/cmake-linux/openfst.cmake @@ -13,29 +13,24 @@ endif() set(WITH_GFLAGS OFF CACHE BOOL "whether build glog with gflags" FORCE) include(glog) -if(REBUILD) +if(NOT EXISTS ${openfst_BUILD}) 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 -r ${openfst_BUILD} && mkdir ${openfst_BUILD}) + execute_process(COMMAND mkdir -p "${openfst_BUILD}") # patch补丁必须打,不然会报glog无法动态识别这个库的方法,导致链接不成功。 - if(EXISTS ${openfst_BUILD}) - - 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} --with-pic - WORKING_DIRECTORY ${LIB_BASE_DIR}/openfst-src) - execute_process( - COMMAND cmake --build . --target install - WORKING_DIRECTORY ${openfst_BUILD}) - execute_process( - COMMAND cmake --install . - WORKING_DIRECTORY ${openfst_BUILD}) - else () - message(FATAL_ERROR "${BoldRed}未创建文件夹${ColourReset}") - endif () + 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} --with-pic + WORKING_DIRECTORY ${LIB_BASE_DIR}/openfst-src) + execute_process( + COMMAND cmake --build . --target install + WORKING_DIRECTORY ${openfst_BUILD}) + execute_process( + COMMAND cmake --install . + WORKING_DIRECTORY ${openfst_BUILD}) endif() # gflags和glog现在被我安装到了系统盘下/usr/lib/x86_64-linux-gnu