!5 update cmakelist

Merge pull request !5 from taoxiangdong/master

CMakeLists.txt

@@ -15,19 +15,39 @@ if (ENABLE_OPEN_SRC)
     include(cmake/FindModule.cmake)
     include(cmake/intf_pub_linux.cmake)
 
-    if(DEFINED ENV{ASCEND_CUSTOM_PATH})
-        set(ASCEND_DIR $ENV{ASCEND_CUSTOM_PATH})
+    if(DEFINED ENV{D_LINK_PATH})
+        # D_LINK_PATH is set
+        set(GE_LIB_PATH $ENV{D_LINK_PATH})
+        set(GE_SYS_ARCH "")
+        if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "x86_64")
+            # x86 ubuntu
+            set(GE_SYS_ARCH "x86_64")
+        elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
+            # arm euleros
+            set(GE_SYS_ARCH "aarch64")
+        else()
+            message(FATAL_ERROR "Running on a unsupported architecture: ${SYSTEM_TYPE}, build terminated")
+        endif()
+        set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH})
+        find_module(slog libslog.so ${GE_LIB_PATH})
+        find_module(mmpa libmmpa.so ${GE_LIB_PATH})
+        find_module(ge_common libge_common.so ${GE_LIB_PATH})
+        find_module(error_manager liberror_manager.so ${GE_LIB_PATH})
     else()
-        set(ASCEND_DIR /usr/local/Ascend)
-    endif()
+        if(DEFINED ENV{ASCEND_CUSTOM_PATH})
+            set(ASCEND_DIR $ENV{ASCEND_CUSTOM_PATH})
+        else()
+            set(ASCEND_DIR /usr/local/Ascend)
+        endif()
 
-    set(ASCEND_DRIVER_DIR ${ASCEND_DIR}/driver/lib64/common)
-    set(ASCEND_RUNTIME_DIR ${ASCEND_DIR}/fwkacllib/lib64)
+        set(ASCEND_DRIVER_DIR ${ASCEND_DIR}/driver/lib64/common)
+        set(ASCEND_RUNTIME_DIR ${ASCEND_DIR}/fwkacllib/lib64)
 
-    find_module(slog libslog.so ${ASCEND_DRIVER_DIR})
-    find_module(mmpa libmmpa.so ${ASCEND_DRIVER_DIR})
-    find_module(ge_common libge_common.so ${ASCEND_RUNTIME_DIR})
-    find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR})
+        find_module(slog libslog.so ${ASCEND_DRIVER_DIR})
+        find_module(mmpa libmmpa.so ${ASCEND_DRIVER_DIR})
+        find_module(ge_common libge_common.so ${ASCEND_RUNTIME_DIR})
+        find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR})
+    endif()
 
     #set(METADEF_DIR ${CMAKE_CURRENT_LIST_DIR}/metadef)
 

cmake/external_libs/securec.cmake

@@ -13,7 +13,8 @@ endif()
 ExternalProject_Add(c_sec_build
                     URL https://gitee.com/openeuler/libboundscheck/repository/archive/v1.1.10.tar.gz
                     #URL /home/txd/workspace/linux_cmake/pkg/protobuf-3.8.0.tar.gz
-                    SOURCE_DIR ${PARSER_DIR}/../libc_sec
+                    #SOURCE_DIR ${PARSER_DIR}/../libc_sec
+                    PATCH_COMMAND patch -p1 < ${GE_CODE_DIR}/third_party/patch/securec/0001-add-securec-cmake-script.patch
                     CONFIGURE_COMMAND ${CMAKE_COMMAND}
                     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}

parser/CMakeLists.txt

@@ -64,6 +64,7 @@ target_include_directories(fmk_parser PRIVATE
     ${PARSER_DIR}/../inc/framework
     ${PARSER_DIR}/../inc/common/util
     ${PARSER_DIR}/../inc/external
+    ${PARSER_DIR}/../third_party/fwkacllib/inc
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/graph
     ${METADEF_DIR}/inc/register

parser/common/CMakeLists.txt

@@ -46,6 +46,7 @@ target_include_directories(parser_common PRIVATE
     ${PARSER_DIR}/../inc/framework
     ${PARSER_DIR}/../inc/common/util
     ${PARSER_DIR}/../inc/external
+    ${PARSER_DIR}/../third_party/fwkacllib/inc
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/graph
     ${METADEF_DIR}/inc/register

parser/onnx/CMakeLists.txt

@@ -34,6 +34,7 @@ target_include_directories(fmk_onnx_parser PRIVATE
     ${PARSER_DIR}/../inc/common/util
     {PARSER_DIR}/../inc/framework
     {PARSER_DIR}/../inc/external
+    ${PARSER_DIR}/../third_party/fwkacllib/inc
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/graph
     ${METADEF_DIR}/inc/register