Skip to content

Commit d99c778

Browse files
committed
Emit HINTS in find_dependency() calls
In order to not force libraries to manipulate CMAKE_PREFIX_PATH, including cases like our own hip-lang.cmake, make ROCm packages look in the place they're installed in order to find their dependencies. This also fixes the dependency-finding macro that's a fallback for pre-3.0 cmake to just forward all agruments to find_package()
1 parent ff41a6f commit d99c778

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ function(rocm_write_package_deps CONFIG_TEMPLATE)
315315
set(DEPENDS ${ARGN})
316316
rocm_list_split(DEPENDS PACKAGE DEPENDS_LIST)
317317
foreach(DEPEND ${DEPENDS_LIST})
318-
rocm_write_package_template_function(${CONFIG_TEMPLATE} find_dependency ${${DEPEND}})
318+
rocm_write_package_template_function(${CONFIG_TEMPLATE} find_dependency ${${DEPEND}} HINTS "\"\${PACKAGE_PREFIX_DIR}\"")
319319
endforeach()
320320
endfunction()
321321

share/rocmcmakebuildtools/cmake/ROCMPackageConfigHelpers.cmake

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ include(CMakeFindDependencyMacro OPTIONAL RESULT_VARIABLE _ROCMCMakeFindDependen
8787
if (NOT _ROCMCMakeFindDependencyMacro_FOUND)
8888
macro(find_dependency dep)
8989
if (NOT \${dep}_FOUND)
90-
set(rocm_fd_version)
91-
if (\${ARGC} GREATER 1)
92-
set(rocm_fd_version \${ARGV1})
93-
endif()
9490
set(rocm_fd_exact_arg)
9591
if(\${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION_EXACT)
9692
set(rocm_fd_exact_arg EXACT)
@@ -103,11 +99,10 @@ if (NOT _ROCMCMakeFindDependencyMacro_FOUND)
10399
if(\${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
104100
set(rocm_fd_required_arg REQUIRED)
105101
endif()
106-
find_package(\${dep} \${rocm_fd_version}
102+
find_package(\${dep} \${ARGN}
107103
\${rocm_fd_exact_arg}
108104
\${rocm_fd_quiet_arg}
109105
\${rocm_fd_required_arg}
110-
HINTS \"\${PACKAGE_PREFIX_DIR}\"
111106
)
112107
string(TOUPPER \${dep} cmake_dep_upper)
113108
if (NOT \${dep}_FOUND AND NOT \${cmake_dep_upper}_FOUND)

0 commit comments

Comments
 (0)