Browse Source

change to depend on static mmpa

pull/90/head
taoxiangdong 5 years ago
parent
commit
d1aff69134
6 changed files with 13 additions and 8 deletions
  1. +2
    -1
      parser/CMakeLists.txt
  2. +1
    -1
      parser/common/CMakeLists.txt
  3. +2
    -1
      parser/common/module.mk
  4. +3
    -2
      parser/module.mk
  5. +2
    -1
      parser/onnx/CMakeLists.txt
  6. +3
    -2
      parser/onnx/module.mk

+ 2
- 1
parser/CMakeLists.txt View File

@@ -92,6 +92,7 @@ target_include_directories(fmk_parser PRIVATE

target_link_libraries(fmk_parser
$<BUILD_INTERFACE:intf_pub>
static_mmpa
-Wl,--no-as-needed
ascend_protobuf
error_manager
@@ -101,10 +102,10 @@ target_link_libraries(fmk_parser
_caffe_parser
c_sec
slog
mmpa
-Wl,--as-needed
json
-lrt
-ldl
)

##################################################################


+ 1
- 1
parser/common/CMakeLists.txt View File

@@ -75,13 +75,13 @@ target_include_directories(parser_common PRIVATE

target_link_libraries(parser_common PRIVATE
$<BUILD_INTERFACE:intf_pub>
static_mmpa
-Wl,--no-as-needed
graph
ascend_protobuf
register
c_sec
slog
mmpa
error_manager
-Wl,--as-needed
json


+ 2
- 1
parser/common/module.mk View File

@@ -94,11 +94,12 @@ LOCAL_SHARED_LIBRARIES := \
libascend_protobuf \
libslog \
libgraph \
libmmpa \
libc_sec \
liberror_manager \
libregister \

LOCAL_STATIC_LIBRARIES += libmmpa

LOCAL_LDFLAGS := -lrt -ldl

include $(BUILD_HOST_SHARED_LIBRARY)

+ 3
- 2
parser/module.mk View File

@@ -115,7 +115,6 @@ LOCAL_C_INCLUDES := $(COMMON_LOCAL_C_INCLUDES)
LOCAL_SHARED_LIBRARIES := \
libascend_protobuf \
libslog \
libmmpa \
libc_sec \
liberror_manager \
libparser_common \
@@ -123,7 +122,9 @@ LOCAL_SHARED_LIBRARIES := \
libregister \
lib_caffe_parser \

LOCAL_LDFLAGS := -lrt
LOCAL_STATIC_LIBRARIES += libmmpa

LOCAL_LDFLAGS := -lrt -ldl

include $(BUILD_HOST_SHARED_LIBRARY)



+ 2
- 1
parser/onnx/CMakeLists.txt View File

@@ -62,6 +62,7 @@ target_include_directories(fmk_onnx_parser PRIVATE

target_link_libraries(fmk_onnx_parser PRIVATE
$<BUILD_INTERFACE:intf_pub>
static_mmpa
-Wl,--no-as-needed
ascend_protobuf
register
@@ -69,10 +70,10 @@ target_link_libraries(fmk_onnx_parser PRIVATE
parser_common
graph
slog
mmpa
-Wl,--as-needed
json
-lrt
-ldl
)

############ install ############


+ 3
- 2
parser/onnx/module.mk View File

@@ -46,12 +46,13 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \
libascend_protobuf \
libslog \
libmmpa \
libc_sec \
libparser_common \
libgraph \
libregister \

LOCAL_LDFLAGS := -lrt
LOCAL_STATIC_LIBRARIES += libmmpa

LOCAL_LDFLAGS := -lrt -ldl

include $(BUILD_HOST_SHARED_LIBRARY)

Loading…
Cancel
Save