pyrox.dev
1diff --git a/hip-config.cmake.in b/hip-config.cmake.in
2index 89d1224e..120b68c6 100755
3--- a/hip-config.cmake.in
4+++ b/hip-config.cmake.in
5@@ -142,7 +142,7 @@ if(HIP_COMPILER STREQUAL "clang")
6 file(TO_CMAKE_PATH "${HIP_PATH}/../lc" HIP_CLANG_ROOT)
7 endif()
8 else()
9- set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm")
10+ set(HIP_CLANG_ROOT "@clang@")
11 endif()
12 if(NOT HIP_CXX_COMPILER)
13 set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER})
14@@ -206,10 +206,7 @@ if(NOT WIN32)
15 #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH=<HSA_PATH>
16 find_path(HSA_HEADER hsa/hsa.h
17 PATHS
18- "${_IMPORT_PREFIX}/include"
19- #FILE_REORG_BACKWARD_COMPATIBILITY ${_IMPORT_PREFIX}/../include is for Backward compatibility
20- "${_IMPORT_PREFIX}/../include"
21- ${ROCM_PATH}/include
22+ "@rocm_runtime@/include"
23 )
24
25 if (NOT HSA_HEADER)
26@@ -224,8 +221,8 @@ set_target_properties(hip::host PROPERTIES
27
28 if(HIP_RUNTIME MATCHES "rocclr")
29 set_target_properties(hip::amdhip64 PROPERTIES
30- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
31- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
32+ INTERFACE_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}"
33+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include;${HSA_HEADER}"
34 )
35
36 get_target_property(amdhip64_type hip::amdhip64 TYPE)
37@@ -233,8 +230,8 @@ if(HIP_RUNTIME MATCHES "rocclr")
38
39 if(NOT WIN32)
40 set_target_properties(hip::device PROPERTIES
41- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
42- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
43+ INTERFACE_INCLUDE_DIRECTORIES "@hip@/include"
44+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "@hip@/include"
45 )
46 endif()
47 endif()
48diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
49index 83866d83..4125d3aa 100644
50--- a/src/CMakeLists.txt
51+++ b/src/CMakeLists.txt
52@@ -178,7 +178,7 @@ if(__HIP_ENABLE_PCH)
53 ${ROCM_PATH}/llvm)
54 # find_package(LLVM) returns the lib/cmake/llvm location. We require the root.
55 if(NOT DEFINED HIP_LLVM_ROOT)
56- set(HIP_LLVM_ROOT "${LLVM_DIR}/../../..")
57+ set(HIP_LLVM_ROOT "@clang@")
58 endif()
59
60 execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/hip_embed_pch.sh ${HIP_COMMON_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${HIP_LLVM_ROOT}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC)
61diff --git a/src/hip_embed_pch.sh b/src/hip_embed_pch.sh
62index 0a1572b2..aa855d63 100755
63--- a/src/hip_embed_pch.sh
64+++ b/src/hip_embed_pch.sh
65@@ -149,7 +149,7 @@ EOF
66
67 $LLVM_DIR/bin/clang -cc1 -O3 -emit-pch -triple amdgcn-amd-amdhsa -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device -std=c++17 -fgnuc-version=4.2.1 -o $tmp/hip_wave64.pch -x hip-cpp-output - <$tmp/pch_wave64.cui &&
68
69- $LLVM_DIR/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj &&
70+ @llvm@/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj &&
71
72 rm -rf $tmp
73 }