AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use CMAKE_SOURCE_DIR

Browse Source 
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


[ROCm/clr commit: a36f19df51]
This commit is contained in:
Matt Arsenault
2020-04-22 10:59:36 -04:00
committed by Matthew Arsenault
parent 1bf1ba550b
commit 36c3008b33
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/rocclr/CMakeLists.txt
+9 -9
View File
@@ -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}
)
projects/clr/rocclr/device/pal/CMakeLists.txt
+9 -9
View File
@@ -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
projects/clr/rocclr/device/rocm/CMakeLists.txt
+2 -2
View File
@@ -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})