2024.5.9

cmake-local/gflags.cmake

@@ -1,17 +1,16 @@
 set(GFLAGS_ROOT_DIR ${LIB_BASE_DIR}/gflags-src)
 set(GFLAGS_BUILD_DIR ${LIB_BASE_DIR}/gflags-build)
-if(NOT EXISTS ${GLOG_BUILD_DIR})
+if(NOT EXISTS ${GFLAGS_BUILD_DIR})
+    message(STATUS "${BoldGreen}Install GFLAGS to: ${GFLAGS_BUILD_DIR}${ColourReset}")
     execute_process(
-            COMMAND mkdir ${GLOG_BUILD_DIR} && cmake -S ${GLOG_ROOT_DIR} -B ${GLOG_BUILD_DIR}
+            COMMAND mkdir gflags-build && cmake -S ${GFLAGS_ROOT_DIR} -B ${GFLAGS_BUILD_DIR} -DGFLAGS_NAMESPACE=google -DCMAKE_CXX_FLAGS=-fPIC
             WORKING_DIRECTORY ${LIB_BASE_DIR})
     execute_process(
             COMMAND cmake --build . -j4
-            WORKING_DIRECTORY ${GLOG_BUILD_DIR})
+            WORKING_DIRECTORY ${GFLAGS_BUILD_DIR})
 endif()
 
 set(GFLAGS_ROOT_DIR ${LIB_BASE_DIR}/gflags-build)
-find_package(gflags REQUIRED CONFIG HINTS ${GFLAGS_ROOT_DIR})
-set(GFLAGS_INCLUDE_DIR ${LIB_BASE_DIR}/gflags-build/include)
-
+find_package(gflags REQUIRED CONFIG HINTS ${GFLAGS_BUILD_DIR})
+include_directories(${GFLAGS_BUILD_DIR}/include)
 list(APPEND third_party_libraries gflags)
-message(STATUS gflags_FOUND)

cmake-local/glog.cmake

@@ -5,15 +5,22 @@
 set(GLOG_ROOT_DIR ${LIB_BASE_DIR}/glog-src)
 set(GLOG_BUILD_DIR ${LIB_BASE_DIR}/glog-build)
 if(NOT EXISTS ${GLOG_BUILD_DIR})
+    message(STATUS "${BoldGreen}Install glog to: ${GLOG_BUILD_DIR}${ColourReset}")
     execute_process(
-            COMMAND mkdir ${GLOG_BUILD_DIR} && cmake -S ${GLOG_ROOT_DIR} -B ${GLOG_BUILD_DIR}
+            COMMAND mkdir glog-build
             WORKING_DIRECTORY ${LIB_BASE_DIR})
+    execute_process(
+            COMMAND cmake -S ${GLOG_ROOT_DIR} -B . -DGFLAGS_NAMESPACE=google
+            WORKING_DIRECTORY ${GLOG_BUILD_DIR})
+
     execute_process(
             COMMAND cmake --build . -j4
             WORKING_DIRECTORY ${GLOG_BUILD_DIR})
 endif()
-
-include_directories(GLOG_BUILD_DIR)
-
+find_package(glog REQUIRED CONFIG HINTS ${GLOG_ROOT_DIR})
+message(STATUS "${BoldGreen}Find Package glog: ${glog_FOUND}${ColourReset}")
+include_directories(${GLOG_BUILD_DIR})
+include_directories(${GLOG_ROOT_DIR}/src)
+link_directories(${GLOG_BUILD_DIR})
 # glog::glog is imported target
-list(APPEND third_party_libraries glog)
+list(APPEND third_party_libraries glog::glog)

cmake-local/onnx.cmake

@@ -1,6 +1,3 @@
-set(ONNX_VERSION "1.12.0")
-set(ONNX_URL "https://github.com/microsoft/onnxruntime/releases/download/v${ONNX_VERSION}/onnxruntime-linux-x64-${ONNX_VERSION}.tgz")
-set(URL_HASH "SHA256=5d503ce8540358b59be26c675e42081be14a3e833a5301926f555451046929c5")
 FetchContent_Declare(onnxruntime
         SOURCE_DIR ${LIB_BASE_DIR}/onnxruntime-src)
 

cmake-local/openfst.cmake

@@ -30,7 +30,7 @@ if(TARGET gflags)
     set_target_properties(gflags PROPERTIES INTERFACE_COMPILE_OPTIONS "-fPIC")
 endif()
 set(WITH_GFLAGS OFF CACHE BOOL "whether build glog with gflags" FORCE)
-find_package(glog)
+include(glog)
 message(STATUS "${BoldGreen}Find Package glog: ${glog_FOUND}${ColourReset}")
 # 下面这堆关键字是防止cmake出一堆无关的提示
 if(NOT GRAPH_TOOLS)
@@ -56,8 +56,8 @@ include_directories(${LIB_BASE_DIR}/openfst-src/src/include)
 
 message(STATUS "${BoldGreen}openfst_BINARY_DIR: ${openfst_BINARY_DIR}${ColourReset}")
 
-add_dependencies(fst gflags glog::glog)
+add_dependencies(fst ${third_party_libraries})
 
-target_link_libraries(fst PUBLIC gflags_nothreads_static glog)
+target_link_libraries(fst PUBLIC gflags_nothreads_static glog dl)
 
 list(APPEND third_party_libraries fst)