diff --git a/ge/common/CMakeLists.txt b/ge/common/CMakeLists.txt index f55ff427..7974a46d 100755 --- a/ge/common/CMakeLists.txt +++ b/ge/common/CMakeLists.txt @@ -84,11 +84,12 @@ target_include_directories(ge_common PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/proto/graphengine_protos #### yellow zone #### - $<$>:${GE_DEPEND_DIR}/inc> - $<$>:${GE_DEPEND_DIR}/inc/cce> + ${GE_DEPEND_DIR}/inc + ${GE_DEPEND_DIR}/inc/cce #### blue zone #### - $<$:${GE_CODE_DIR}/third_party/fwkacllib/inc> - $<$:${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain> + #${GE_DEPEND_DIR}/include + ${GE_CODE_DIR}/third_party/fwkacllib/inc + ${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain ) target_link_options(ge_common PRIVATE @@ -97,9 +98,6 @@ target_link_options(ge_common PRIVATE target_link_libraries(ge_common PRIVATE $ - $<$>:$> - $<$>:$> - $<$>:$> static_mmpa -Wl,--no-as-needed graph @@ -153,18 +151,16 @@ target_include_directories(ge_common_static PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/proto/graphengine_protos #### yellow zone #### - $<$>:${GE_DEPEND_DIR}/inc> - $<$>:${GE_DEPEND_DIR}/inc/cce> + ${GE_DEPEND_DIR}/inc + ${GE_DEPEND_DIR}/inc/cce #### blue zone #### - $<$:${GE_CODE_DIR}/third_party/fwkacllib/inc> - $<$:${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain> + #${GE_DEPEND_DIR}/include + ${GE_CODE_DIR}/third_party/fwkacllib/inc + ${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain ) target_link_libraries(ge_common_static PRIVATE $ - $<$>:$> - $<$>:$> - $<$>:$> ascend_protobuf_static json c_sec diff --git a/ge/executor/CMakeLists.txt b/ge/executor/CMakeLists.txt old mode 100755 new mode 100644 index b6342973..b04216b8 --- a/ge/executor/CMakeLists.txt +++ b/ge/executor/CMakeLists.txt @@ -187,18 +187,15 @@ target_include_directories(ge_executor SYSTEM PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/proto/graphengine_protos #### yellow zone #### - $<$>:${GE_DEPEND_DIR}/inc> - $<$>:${GE_DEPEND_DIR}/inc/cce> + ${GE_CODE_DIR}/../inc + ${GE_CODE_DIR}/../inc/cce #### blue zone #### - $<$:${GE_CODE_DIR}/third_party/fwkacllib/inc> - $<$:${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain> + ${GE_CODE_DIR}/third_party/fwkacllib/inc + ${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain ) target_link_libraries(ge_executor PRIVATE $ - $<$>:$> - $<$>:$> - $<$>:$> json ascend_protobuf_static c_sec @@ -241,10 +238,10 @@ target_include_directories(ge_executor_shared PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/proto/graphengine_protos #### yellow zone #### - $<$>:${GE_DEPEND_DIR}/inc> - $<$>:${GE_DEPEND_DIR}/inc/cce> + ${GE_CODE_DIR}/../inc + ${GE_CODE_DIR}/../inc/cce #### blue zone #### - $<$:${GE_CODE_DIR}/third_party/fwkacllib/inc> + ${GE_CODE_DIR}/third_party/fwkacllib/inc ) target_link_options(ge_executor_shared PRIVATE @@ -254,9 +251,6 @@ target_link_options(ge_executor_shared PRIVATE target_link_libraries(ge_executor_shared PRIVATE $ - $<$>:$> - $<$>:$> - $<$>:$> -Wl,--no-as-needed ge_common runtime