AI/rocm-systems
2
0
포크 0
코드 이슈 풀 리퀘스트 액션 패키지 프로젝트 릴리즈 위키 활동

Don't use CMAKE_SOURCE_DIR

소스 검색 
This is almost never the correct thing to use since it breaks adding
this as a subproject build in a larger build. Switch to refer to
CMAKE_CURRENT_SOURCE_DIR, which is equivalent in a standalone build.

Change-Id: Ib8dbbc0668491f4227389b9a5b27da770b3bc5ce
이 커밋은 다음에 포함됨:
Matt Arsenault
2020-04-22 10:59:36 -04:00
커밋한 사람 Matthew Arsenault
부모 bb348a463d
커밋 a36f19df51
3개의 변경된 파일과 20개의 추가작업 그리고 20개의 파일을 삭제
패치 파일 다운로드 Diff 파일 다운로드 모든 파일 펼침 모든 파일 접기
rocclr/CMakeLists.txt
+9 -9
파일 보기
@@ -75,9 +75,9 @@ if (DEFINED LLVM_INCLUDES AND NOT ${LLVM_INCLUDES} STREQUAL "")
include_directories(${LLVM_INCLUDES})
endif() # if (DEFINED LLVM_INCLUDES AND NOT ${LLVM_INCLUDES} STREQUAL "")
include_directories(${CMAKE_SOURCE_DIR})
include_directories(${CMAKE_SOURCE_DIR}/include)
include_directories(${CMAKE_SOURCE_DIR}/device/rocm)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/device/rocm)
include_directories(${OPENCL_DIR})
include_directories(${OPENCL_DIR}/amdocl)
include_directories(${OPENCL_DIR}/khronos)
@@ -87,12 +87,12 @@ include_directories(${OPENCL_INCLUDE_DIR})
include_directories(${COMGR_INCLUDE})
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib)
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include)
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/compiler/lib)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/compiler/lib/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/compiler/lib/backends/common)
include_directories(${CMAKE_SOURCE_DIR}/elf/utils/common)
include_directories(${CMAKE_SOURCE_DIR}/elf/utils/libelf)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/elf/utils/common)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/elf/utils/libelf)
option(BUILD_PAL "Build PAL backend" OFF)
if (BUILD_PAL)
@@ -143,7 +143,7 @@ add_library(oclruntime OBJECT
compiler/lib/utils/options.cpp
elf/elf.cpp
elf/elf_utils.cpp
#${CMAKE_SOURCE_DIR}/compiler/tools/caching/cache.cpp
#${CMAKE_CURRENT_SOURCE_DIR}/compiler/tools/caching/cache.cpp
${COMGR_CPP}
)
rocclr/device/pal/CMakeLists.txt
+9 -9
파일 보기
@@ -41,7 +41,7 @@ option(PAL_DEVELOPER_BUILD "No developer build" OFF)
set(PYTHON_EXECUTABLE /usr/bin/python3)
# Build PAL . . .
set(GLOBAL_ROOT_SRC_DIR ${CMAKE_SOURCE_DIR})
set(GLOBAL_ROOT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(palbe)
# Setup defines for the client compilation
@@ -84,15 +84,15 @@ if(UNIX)
target_compile_definitions(vdipal PRIVATE PAL_AMDGPU_BUILD)
endif()
target_include_directories(vdipal PRIVATE ${CMAKE_SOURCE_DIR}/compiler/sc/HSAIL/include)
target_include_directories(vdipal PRIVATE ${CMAKE_SOURCE_DIR}/../asic_reg)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/compiler/sc/HSAIL/include)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../asic_reg)
target_include_directories(vdipal PRIVATE ${CMAKE_SOURCE_DIR}/device/pal/palbe)
target_include_directories(vdipal PRIVATE ${CMAKE_SOURCE_DIR}/device/pal/palbe/inc)
target_include_directories(vdipal PRIVATE ${CMAKE_SOURCE_DIR}/device/pal/palbe/inc/core)
target_include_directories(vdipal PRIVATE ${CMAKE_SOURCE_DIR}/device/pal/palbe/inc/util)
target_include_directories(vdipal PRIVATE ${CMAKE_SOURCE_DIR}/device/pal/palbe/shared/gpuopen/inc)
target_include_directories(vdipal PRIVATE ${CMAKE_SOURCE_DIR}/device/pal/palbe/shared/gpuopen/third_party/metrohash/src)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/inc)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/inc/core)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/inc/util)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/shared/gpuopen/inc)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/shared/gpuopen/third_party/metrohash/src)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_sources(vdipal PRIVATE
rocclr/device/rocm/CMakeLists.txt
+2 -2
파일 보기
@@ -1,5 +1,5 @@
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common)
include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/compiler/lib/loaders/elf/utils/libelf)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${ROCM_OCL_INCLUDES})