taoxudonghaha
4 years ago
3 changed files with 8 additions and 2 deletions
Unified View
Diff Options
-
+6 -0cmake/external_libs/protobuf_static.cmake
-
+1 -1ge/common/CMakeLists.txt
-
+1 -1ge/executor/CMakeLists.txt
+ 6
- 0
cmake/external_libs/protobuf_static.cmake
View File
| @@ -1,3 +1,7 @@ | |||||
| if (HAVE_PROTOBUF_STATIC) | |||||
| return() | |||||
| endif() | |||||
| include(ExternalProject) | include(ExternalProject) | ||||
| include(GNUInstallDirs) | include(GNUInstallDirs) | ||||
| #set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output) | #set(CMAKE_INSTALL_PREFIX ${GE_CODE_DIR}/output) | ||||
| @@ -58,3 +62,5 @@ include_directories(${PROTOBUF_STATIC_PKG_DIR}/include) | |||||
| endif () | endif () | ||||
| add_dependencies(ascend_protobuf_static protobuf_static_build) | add_dependencies(ascend_protobuf_static protobuf_static_build) | ||||
| set(HAVE_PROTOBUF_STATIC TRUE) | |||||
+ 1
- 1
ge/common/CMakeLists.txt
View File
| @@ -170,7 +170,7 @@ target_include_directories(ge_common_static PRIVATE | |||||
| target_link_libraries(ge_common_static PRIVATE | target_link_libraries(ge_common_static PRIVATE | ||||
| $<BUILD_INTERFACE:intf_pub> | $<BUILD_INTERFACE:intf_pub> | ||||
| ascend_protobuf | |||||
| ascend_protobuf_static | |||||
| json | json | ||||
| c_sec | c_sec | ||||
| $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | ||||
+ 1
- 1
ge/executor/CMakeLists.txt
View File
| @@ -202,7 +202,7 @@ target_include_directories(ge_executor SYSTEM PRIVATE | |||||
| target_link_libraries(ge_executor PRIVATE | target_link_libraries(ge_executor PRIVATE | ||||
| $<BUILD_INTERFACE:intf_pub> | $<BUILD_INTERFACE:intf_pub> | ||||
| json | json | ||||
| ascend_protobuf | |||||
| ascend_protobuf_static | |||||
| c_sec | c_sec | ||||
| $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | ||||
| -ldl | -ldl | ||||