From edb516e1faa460c4589094215ec27ad78e73861f Mon Sep 17 00:00:00 2001 From: taoxudonghaha Date: Thu, 17 Dec 2020 21:52:31 +0800 Subject: [PATCH] solve static depend and circle depend --- CMakeLists.txt | 2 ++ cmake/FindModule.cmake | 7 ++----- metadef | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index def55a8..1e6b2d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,8 @@ if (ENABLE_OPEN_SRC) find_module(slog libslog.so ${GE_LIB_PATH}) find_module(static_mmpa libmmpa.a ${GE_LIB_PATH}) find_module(error_manager liberror_manager.so ${GE_LIB_PATH}) + elseif(ENABLE_GE_COV OR ENABLE_GE_UT) + message(STATUS "Runing on llt mode, no need to depend other component") else() if(DEFINED ENV{ASCEND_CUSTOM_PATH}) set(ASCEND_DIR $ENV{ASCEND_CUSTOM_PATH}) diff --git a/cmake/FindModule.cmake b/cmake/FindModule.cmake index 74a6363..d0c85da 100644 --- a/cmake/FindModule.cmake +++ b/cmake/FindModule.cmake @@ -7,6 +7,7 @@ function(find_module module name path) if (TARGET ${module}) return() endif() + add_library(${module} INTERFACE) find_library(${module}_LIBRARY_DIR NAMES ${name} NAMES_PER_DIR PATHS ${path} PATH_SUFFIXES lib ) @@ -15,9 +16,5 @@ function(find_module module name path) if ("${${module}_LIBRARY_DIR}" STREQUAL "${module}_LIBRARY_DIR-NOTFOUND") message(FATAL_ERROR "${name} not found in ${path}") endif() - - add_library(${module} SHARED IMPORTED) - set_target_properties(${module} PROPERTIES - IMPORTED_LOCATION ${${module}_LIBRARY_DIR} - ) + target_link_libraries(${module} INTERFACE ${${module}_LIBRARY_DIR}) endfunction() diff --git a/metadef b/metadef index f8a635f..5546f5f 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit f8a635f0f9616a63d54cbaee380591515e4b3e35 +Subproject commit 5546f5f4701130f2dd11a6d69817dc37d52c497e