From 4f0034353e4af3b2caf252f8c3ca2ada7f324df8 Mon Sep 17 00:00:00 2001 From: yanghaoran Date: Mon, 20 Apr 2020 17:01:10 +0800 Subject: [PATCH] add realpath to acquire real cmake dir despite usage of symbolic links --- cmake/dependency_graphengine.cmake | 2 +- graphengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/dependency_graphengine.cmake b/cmake/dependency_graphengine.cmake index 2a90cc1458..533f9f8246 100644 --- a/cmake/dependency_graphengine.cmake +++ b/cmake/dependency_graphengine.cmake @@ -64,7 +64,7 @@ set(_ge_tmp_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) string(REPLACE " -Wall" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") string(REPLACE " -Werror" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # force __FILE__ to show relative path of file, from source directory -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__FILE__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"' -Wno-builtin-macro-redefined") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__FILE__='\"$(subst $(realpath ${CMAKE_SOURCE_DIR})/,,$(abspath $<))\"' -Wno-builtin-macro-redefined") add_subdirectory(${GE_SOURCE_DIR}/src/common/graph) if(ENABLE_D) add_subdirectory(${GE_SOURCE_DIR}/src/ge/common) diff --git a/graphengine b/graphengine index 0c33e9d125..43f5d24337 160000 --- a/graphengine +++ b/graphengine @@ -1 +1 @@ -Subproject commit 0c33e9d12562953ca4bd6c03cb77da2c2da74acd +Subproject commit 43f5d24337bf785251eefae2d810c7d5684194d6