diff --git a/cmake/external_libs/glog.cmake b/cmake/external_libs/glog.cmake index f372c8e3c2f..0c89718f790 100644 --- a/cmake/external_libs/glog.cmake +++ b/cmake/external_libs/glog.cmake @@ -5,6 +5,6 @@ mindspore_add_pkg(glog LIBS glog URL https://github.com/google/glog/archive/v0.4.0.tar.gz MD5 0daea8785e6df922d7887755c3d100d0 - CMAKE_OPTION -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON) + CMAKE_OPTION -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=ON -DWITH_GFLAGS=OFF) include_directories(${glog_INC}) add_library(mindspore::glog ALIAS glog::glog) diff --git a/mindspore/lite/test/run_benchmark_nets.sh b/mindspore/lite/test/run_benchmark_nets.sh index d315be893eb..9ed6ac96d7c 100644 --- a/mindspore/lite/test/run_benchmark_nets.sh +++ b/mindspore/lite/test/run_benchmark_nets.sh @@ -9,7 +9,7 @@ function Run_Converter() { tar -zxf mindspore-lite-${version}-converter-ubuntu.tar.gz || exit 1 cd ${x86_path}/mindspore-lite-${version}-converter-ubuntu || exit 1 cp converter/converter_lite ./ || exit 1 - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:./lib/:./third_party/protobuf/lib:./third_party/flatbuffers/lib + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:./lib/:./third_party/protobuf/lib:./third_party/flatbuffers/lib:./third_party/glog/lib # Convert the models cd ${x86_path}/mindspore-lite-${version}-converter-ubuntu || exit 1 diff --git a/mindspore/lite/tools/converter/CMakeLists.txt b/mindspore/lite/tools/converter/CMakeLists.txt index 68ec75f20ec..66857a3a02b 100644 --- a/mindspore/lite/tools/converter/CMakeLists.txt +++ b/mindspore/lite/tools/converter/CMakeLists.txt @@ -177,5 +177,5 @@ if (NOT PLATFORM_ARM64 AND NOT PLATFORM_ARM32) install(FILES ${TOP_DIR}/mindspore/lite/build/tools/converter/mindspore_core/gvar/libmindspore_gvar.so DESTINATION ${MAIN_DIR}-${COMPONENT_NAME}/lib COMPONENT ${COMPONENT_NAME}) install(FILES ${glog_LIBPATH}/libglog.so.0.4.0 - DESTINATION ${MAIN_DIR}-${COMPONENT_NAME}/lib RENAME libglog.so.0 COMPONENT ${COMPONENT_NAME}) + DESTINATION ${MAIN_DIR}-${COMPONENT_NAME}/third_party/glog/lib RENAME libglog.so.0 COMPONENT ${COMPONENT_NAME}) endif ()