已合并
feat: 为opapi共享库链接opbase_util_objs以支持log.h调用 #2693
songkai111创建于 5月12日
feat: 为opapi共享库链接opbase_util_objs以支持log.h调用 #2693
已合并
共 2 个文件变更+3-0
| @@ -170,6 +170,7 @@ function(add_opapi_modules) | |||
| 170 | ${OPHOST_NAME}_opapi_obj | 170 | ${OPHOST_NAME}_opapi_obj |
| 171 | PUBLIC $<BUILD_INTERFACE:$<IF:$<BOOL:${ENABLE_TEST}>,intf_llt_pub_asan_cxx17,intf_pub_cxx17>> | 171 | PUBLIC $<BUILD_INTERFACE:$<IF:$<BOOL:${ENABLE_TEST}>,intf_llt_pub_asan_cxx17,intf_pub_cxx17>> |
| 172 | PRIVATE $<BUILD_INTERFACE:adump_headers> $<BUILD_INTERFACE:dlog_headers> | 172 | PRIVATE $<BUILD_INTERFACE:adump_headers> $<BUILD_INTERFACE:dlog_headers> |
| 173 | + $<$<TARGET_EXISTS:opbase_util_objs>:$<TARGET_OBJECTS:opbase_util_objs>> | ||
| 173 | ) | 174 | ) |
| 174 | endif() | 175 | endif() |
| 175 | endfunction() | 176 | endfunction() |
| @@ -232,6 +232,7 @@ function(gen_opapi_symbol) | |||
| 232 | ${OPAPI_NAME} SHARED | 232 | ${OPAPI_NAME} SHARED |
| 233 | $<$<TARGET_EXISTS:${OPHOST_NAME}_opapi_obj>:$<TARGET_OBJECTS:${OPHOST_NAME}_opapi_obj>> | 233 | $<$<TARGET_EXISTS:${OPHOST_NAME}_opapi_obj>:$<TARGET_OBJECTS:${OPHOST_NAME}_opapi_obj>> |
| 234 | $<$<TARGET_EXISTS:opbuild_gen_aclnn_all>:$<TARGET_OBJECTS:opbuild_gen_aclnn_all>> | 234 | $<$<TARGET_EXISTS:opbuild_gen_aclnn_all>:$<TARGET_OBJECTS:opbuild_gen_aclnn_all>> |
| 235 | + $<$<TARGET_EXISTS:opbase_util_objs>:$<TARGET_OBJECTS:opbase_util_objs>> | ||
| 235 | ) | 236 | ) |
| 236 | 237 | ||
| 237 | target_link_libraries( | 238 | target_link_libraries( |
| @@ -255,6 +256,7 @@ function(gen_cust_opapi_symbol) | |||
| 255 | cust_opapi | 256 | cust_opapi |
| 256 | PUBLIC $<$<TARGET_EXISTS:${OPHOST_NAME}_opapi_obj>:$<TARGET_OBJECTS:${OPHOST_NAME}_opapi_obj>> | 257 | PUBLIC $<$<TARGET_EXISTS:${OPHOST_NAME}_opapi_obj>:$<TARGET_OBJECTS:${OPHOST_NAME}_opapi_obj>> |
| 257 | $<$<TARGET_EXISTS:opbuild_gen_aclnn_all>:$<TARGET_OBJECTS:opbuild_gen_aclnn_all>> | 258 | $<$<TARGET_EXISTS:opbuild_gen_aclnn_all>:$<TARGET_OBJECTS:opbuild_gen_aclnn_all>> |
| 259 | + $<$<TARGET_EXISTS:opbase_util_objs>:$<TARGET_OBJECTS:opbase_util_objs>> | ||
| 258 | ) | 260 | ) |
| 259 | target_link_libraries( | 261 | target_link_libraries( |
| 260 | cust_opapi | 262 | cust_opapi |