From 0f495a009a626a759788ade1ae59f9de3e5a6d23 Mon Sep 17 00:00:00 2001 From: Freddy Paul Date: Wed, 29 Jul 2020 14:29:08 -0700 Subject: [PATCH] Enable developers to build hip without CMAKE_PREFIX_PATH With recent changes in ROCclr to take HSA cmake target it require HIP to have CMAKE_PREFIX_PATH added for install location for HSA, amd_comgr,llvm. User can provide CMAKE_PREFIX_PATH if above packages are built/installed at custom location as: cmake -DCMAKE_PREFIX_PATH=" " For default ROCm installation adding a default path will help. Change-Id: Iefa443dc198da76b57422a641c9821c63cde4922 [ROCm/hip commit: 6e50c0f7553f60e6ebdfceaf87fbf316f6b6a7ba] --- projects/hip/rocclr/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/hip/rocclr/CMakeLists.txt b/projects/hip/rocclr/CMakeLists.txt index bef5de347c..e6c4225984 100755 --- a/projects/hip/rocclr/CMakeLists.txt +++ b/projects/hip/rocclr/CMakeLists.txt @@ -66,6 +66,14 @@ if(NOT DEFINED ROCclr_DIR OR NOT DEFINED LIBOCL_STATIC_DIR OR NOT DEFINED LIBROC # message(FATAL_ERROR "define ROCclr_DIR, LIBOCL_STATIC_DIR\n") endif() + +#APPEND default path for CMAKE_PREFIX_PATH +#User provided will be searched first since defualt path is at end. +#Custom install path can be provided at compile time as cmake parameter(-DCMAKE_PREFIX_PATH="") +#/opt/rocm:default:For amd_comgr,hsa-runtime64 +#/opt/rocm/llvm/:default:For llvm/clang pulled in as dependency from hsa/comgr +list( APPEND CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "/opt/rocm" "/opt/rocm/llvm") + list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ) set(CMAKE_MODULE_PATH${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")