From 66f9f1946c838bb415160d342e22a9e637f58870 Mon Sep 17 00:00:00 2001
From: taoxiangdong <taoxiangdong1@huawei.com>
Date: Sat, 17 Oct 2020 16:39:39 +0800
Subject: [PATCH] update cmake for atc

---
 CMakeLists.txt             | 8 ++++----
 cmake/intf_pub_linux.cmake | 2 +-
 ge/CMakeLists.txt          | 3 ++-
 ge/offline/CMakeLists.txt  | 6 ++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00fdece8..d06e7d3c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,11 +21,11 @@ if (ENABLE_OPEN_SRC)
     include(cmake/intf_pub_linux.cmake)
 
     # for CPU/GPU mode, find c_sec and slog from local prebuild
-    if(NOT ENABLE_D AND NOT GE_ONLY)
-        set(GE_PREBUILD_PATH ${GE_CODE_DIR}/third_party/prebuild/${CMAKE_HOST_SYSTEM_PROCESSOR})
-        find_module(slog libslog.so ${GE_PREBUILD_PATH})
+    #if(NOT ENABLE_D AND NOT GE_ONLY)
+    #    set(GE_PREBUILD_PATH ${GE_CODE_DIR}/third_party/prebuild/${CMAKE_HOST_SYSTEM_PROCESSOR})
+    #    find_module(slog libslog.so ${GE_PREBUILD_PATH})
     # if D_LINK_PATH is set in environment variables, search libraries in given path
-    elseif(DEFINED ENV{D_LINK_PATH})
+    if(DEFINED ENV{D_LINK_PATH})
         # D_LINK_PATH is set
         set(GE_LIB_PATH $ENV{D_LINK_PATH})
         set(GE_SYS_ARCH "")
diff --git a/cmake/intf_pub_linux.cmake b/cmake/intf_pub_linux.cmake
index 325a1b14..a98fee07 100755
--- a/cmake/intf_pub_linux.cmake
+++ b/cmake/intf_pub_linux.cmake
@@ -11,7 +11,7 @@ target_compile_options(intf_pub INTERFACE
     $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>    
 )
 target_compile_definitions(intf_pub INTERFACE
-    $<$<STREQUAL:${PRODUCT_SIDE},host>:_GLIBCXX_USE_CXX11_ABI=0> 
+    _GLIBCXX_USE_CXX11_ABI=0
     $<$<CONFIG:Release>:CFG_BUILD_NDEBUG>
     $<$<CONFIG:Debug>:CFG_BUILD_DEBUG>   
     WIN64=1
diff --git a/ge/CMakeLists.txt b/ge/CMakeLists.txt
index dfc01ffa..c6a56456 100755
--- a/ge/CMakeLists.txt
+++ b/ge/CMakeLists.txt
@@ -12,7 +12,7 @@ set(PROTO_LIST
 )
 
 set(PROTO_CLIENT_LIST
-    "${GE_CODE_DIR}/ge/proto/ge_api.proto"
+    "${METADEF_DIR}/proto/ge_api.proto"
 )
 
 set(PROTO_HEADER_LIST
@@ -667,6 +667,7 @@ target_include_directories(ge_compiler PRIVATE
     ${GE_CODE_DIR}/inc/external
     ${GE_CODE_DIR}/inc/framework
     ${GE_CODE_DIR}/inc/framework/common
+    ${METADEF_DIR}
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/external
diff --git a/ge/offline/CMakeLists.txt b/ge/offline/CMakeLists.txt
index 85f6715f..062f3df3 100644
--- a/ge/offline/CMakeLists.txt
+++ b/ge/offline/CMakeLists.txt
@@ -29,13 +29,19 @@ target_compile_definitions(atc PRIVATE
 
 target_include_directories(atc PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
+    ${GE_CODE_DIR}/ge
     ${GE_CODE_DIR}/graphengine
     ${GE_CODE_DIR}/inc/external
     ${GE_CODE_DIR}/common/inc/external
     ${GE_CODE_DIR}/common/inc/external/graph
+    ${GE_CODE_DIR}/inc
     ${GE_CODE_DIR}/inc/framework
+    ${METADEF_DIR}/inc
+    ${METADEF_DIR}/inc/external
     ${CMAKE_BINARY_DIR}
     ${CMAKE_BINARY_DIR}/proto/ge
+    ${GE_CODE_DIR}/third_party/fwkacllib/inc
+    ${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     ${GE_CODE_DIR}/../inc/common