diff --git a/akg b/akg index c9da0658b93..6ab4b3fbc65 160000 --- a/akg +++ b/akg @@ -1 +1 @@ -Subproject commit c9da0658b938c56bdf34617673774f4ebb81bcf9 +Subproject commit 6ab4b3fbc650d15086b01db0ffcd21321c575e96 diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 15f505a9e4b..34bf6583c47 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -242,11 +242,14 @@ function(mindspore_add_pkg pkg_name) set(${pkg_name}_PATCHES_HASH "${${pkg_name}_PATCHES_HASH},${_PF_SHA256}") endforeach() + # strip directory variables to ensure third party packages are installed in consistent locations + string(REPLACE ${TOP_DIR} "" ARGN_STRIPPED ${ARGN}) + string(REPLACE ${_MS_LIB_CACHE} "" ARGN_STRIPPED ${ARGN_STRIPPED}) # check options set(${pkg_name}_CONFIG_TXT "${CMAKE_CXX_COMPILER_VERSION}-${CMAKE_C_COMPILER_VERSION} - ${ARGN} - ${${pkg_name}_USE_STATIC_LIBS}- ${${pkg_name}_PATCHES_HASH} - ${${pkg_name}_CXXFLAGS}--${${pkg_name}_CFLAGS}--${${pkg_name}_LDFLAGS}") + ${ARGN_STRIPPED}-${${pkg_name}_USE_STATIC_LIBS}-${${pkg_name}_PATCHES_HASH} + ${${pkg_name}_CXXFLAGS}-${${pkg_name}_CFLAGS}-${${pkg_name}_LDFLAGS}") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(${pkg_name}_CONFIG_TXT "${${pkg_name}_CONFIG_TXT}--${CMAKE_OSX_DEPLOYMENT_TARGET}") endif()