From a36f19df51f14972cfc5cd09238c656cad180c80 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Wed, 22 Apr 2020 10:59:36 -0400 Subject: [PATCH] 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 --- rocclr/CMakeLists.txt | 18 +++++++++--------- rocclr/device/pal/CMakeLists.txt | 18 +++++++++--------- rocclr/device/rocm/CMakeLists.txt | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/rocclr/CMakeLists.txt b/rocclr/CMakeLists.txt index bcce8a76d1..06f283ba01 100644 --- a/rocclr/CMakeLists.txt +++ b/rocclr/CMakeLists.txt @@ -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} ) diff --git a/rocclr/device/pal/CMakeLists.txt b/rocclr/device/pal/CMakeLists.txt index 024b14cec2..2fa9524e11 100644 --- a/rocclr/device/pal/CMakeLists.txt +++ b/rocclr/device/pal/CMakeLists.txt @@ -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 diff --git a/rocclr/device/rocm/CMakeLists.txt b/rocclr/device/rocm/CMakeLists.txt index 41529d7dd1..a544d89ce4 100644 --- a/rocclr/device/rocm/CMakeLists.txt +++ b/rocclr/device/rocm/CMakeLists.txt @@ -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})