diff --git a/cmake-linux/grpc.cmake b/cmake-linux/grpc.cmake index 56d9bd5..bfe1821 100644 --- a/cmake-linux/grpc.cmake +++ b/cmake-linux/grpc.cmake @@ -5,7 +5,7 @@ set(grpc_build_dir "${LIB_BASE_DIR}/grpc-build") if(NOT EXISTS ${grpc_build_dir}) # install grpc execute_process(COMMAND mkdir -p ${grpc_build_dir}) - message(STATUS "${BoldGreen}Install grpc third party library") + message(STATUS "${BoldGreen}Install grpc third party library${ColourReset}") execute_process( COMMAND cmake -DgRPC_INSTALL=ON diff --git a/cmake-linux/wetextprocessing.cmake b/cmake-linux/wetextprocessing.cmake index 918c325..28758d9 100644 --- a/cmake-linux/wetextprocessing.cmake +++ b/cmake-linux/wetextprocessing.cmake @@ -1,35 +1,14 @@ -if(NOT ANDROID) - FetchContent_Declare(wetextprocessing - GIT_REPOSITORY https://github.com/wenet-e2e/WeTextProcessing.git - GIT_TAG origin/master - ) - FetchContent_MakeAvailable(wetextprocessing) - include_directories(${wetextprocessing_SOURCE_DIR}/runtime) - add_subdirectory(${wetextprocessing_SOURCE_DIR}/runtime/utils) - add_subdirectory(${wetextprocessing_SOURCE_DIR}/runtime/processor) -else() - include(ExternalProject) - set(ANDROID_CMAKE_ARGS - -DBUILD_TESTING=OFF - -DBUILD_SHARED_LIBS=OFF - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - -DANDROID_ABI=${ANDROID_ABI} - -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} - -DCMAKE_CXX_FLAGS=-I${openfst_BINARY_DIR}/include - -DCMAKE_EXE_LINKER_FLAGS=-L${openfst_BINARY_DIR}/${ANDROID_ABI} - ) - ExternalProject_Add(wetextprocessing - GIT_REPOSITORY https://github.com/wenet-e2e/WeTextProcessing.git - GIT_TAG origin/master - SOURCE_SUBDIR runtime - CMAKE_ARGS ${ANDROID_CMAKE_ARGS} - INSTALL_COMMAND "" - ) - ExternalProject_Get_Property(wetextprocessing SOURCE_DIR BINARY_DIR) - include_directories(${SOURCE_DIR}/runtime) - link_directories(${BINARY_DIR}/processor ${BINARY_DIR}/utils) - link_libraries(wetext_utils) -endif() +set(wetext_BUILD_DIR "${LIB_BASE_DIR}/wetextprocessing-build") +set(wetext_SOURCE_DIR "${LIB_BASE_DIR}/wetextprocessing-src") +if(NOT EXISTS ${wetext_BUILD_DIR}) + execute_process(COMMAND mkdir -p ${wetext_BUILD_DIR}) + message(STATUS "${BoldGreen}Install wetextprocessing library${ColourReset}") + execute_process( + COMMAND cmake -B ${wetext_BUILD_DIR} -S ${wetext_SOURCE_DIR}/runtime -DCMAKE_BUILD_TYPE=Release -j4 -fPIC && + cmake --build . + WORKING_DIRECTORY ${wetext_BUILD_DIR}) +endif () +include_directories(${wetext_SOURCE_DIR}/runtime) +#add_subdirectory(${wetext_SOURCE_DIR}/runtime/utils) +#add_subdirectory(${wetext_SOURCE_DIR}/runtime/processor) \ No newline at end of file