diff --git a/cmake-linux/gflags.cmake b/cmake-linux/gflags.cmake index c13b422..5b6d98b 100644 --- a/cmake-linux/gflags.cmake +++ b/cmake-linux/gflags.cmake @@ -2,8 +2,8 @@ set(GFLAGS_ROOT_DIR ${LIB_BASE_DIR}/gflags-src) set(GFLAGS_BUILD_DIR ${LIB_BASE_DIR}/gflags-build) if(REBUILD) message(STATUS "${BoldGreen}Install GFLAGS to: ${GFLAGS_BUILD_DIR}${ColourReset}") - execute_process( - COMMAND rm -rf gflags-build && mkdir gflags-build && + execute_process(COMMAND rm -rf ${GFLAGS_BUILD_DIR} && mkdir ${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}) execute_process( diff --git a/cmake-linux/openfst.cmake b/cmake-linux/openfst.cmake index f9b359b..87a57bc 100644 --- a/cmake-linux/openfst.cmake +++ b/cmake-linux/openfst.cmake @@ -16,21 +16,26 @@ include(glog) 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}) + execute_process(COMMAND rm -r ${openfst_BUILD} && mkdir ${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} --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}) + 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 () endif() # gflags和glog现在被我安装到了系统盘下/usr/lib/x86_64-linux-gnu