modify static depends

4 years ago · 043e4569b4
parent 0aa3f311a7
commit 043e4569b4
3 changed files with 8 additions and 2 deletions
--- a/cmake/external_libs/protobuf_static.cmake
+++ b/cmake/external_libs/protobuf_static.cmake
@ -1,3 +1,7 @@
+if (HAVE_PROTOBUF_STATIC)
+    return()
+endif()
+
 include(ExternalProject)
 include(GNUInstallDirs)
 #set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output)
@ -58,3 +62,5 @@ include_directories(${PROTOBUF_STATIC_PKG_DIR}/include)
 endif ()

 add_dependencies(ascend_protobuf_static protobuf_static_build)
+
+set(HAVE_PROTOBUF_STATIC TRUE)
--- a/ge/common/CMakeLists.txt
+++ b/ge/common/CMakeLists.txt
@ -170,7 +170,7 @@ target_include_directories(ge_common_static PRIVATE

 target_link_libraries(ge_common_static PRIVATE
    $<BUILD_INTERFACE:intf_pub>
-    ascend_protobuf
+    ascend_protobuf_static
    json
    c_sec
    $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt>
--- a/ge/executor/CMakeLists.txt
+++ b/ge/executor/CMakeLists.txt
@ -202,7 +202,7 @@ target_include_directories(ge_executor SYSTEM PRIVATE
 target_link_libraries(ge_executor PRIVATE
    $<BUILD_INTERFACE:intf_pub>
    json
-    ascend_protobuf
+    ascend_protobuf_static
    c_sec
    $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt>
    -ldl