Browse Source

solve static depend and circle depend

pull/149/head
taoxudonghaha 4 years ago
parent
commit
edb516e1fa
3 changed files with 5 additions and 6 deletions
  1. +2
    -0
      CMakeLists.txt
  2. +2
    -5
      cmake/FindModule.cmake
  3. +1
    -1
      metadef

+ 2
- 0
CMakeLists.txt View File

@@ -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})


+ 2
- 5
cmake/FindModule.cmake View File

@@ -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()

+ 1
- 1
metadef

@@ -1 +1 @@
Subproject commit f8a635f0f9616a63d54cbaee380591515e4b3e35
Subproject commit 5546f5f4701130f2dd11a6d69817dc37d52c497e

Loading…
Cancel
Save