Skip to content

Commit 169e359

Browse files
Merge commit 'da26938fcc8bd7ede30692c55f79fd9f5a343f7b' into import/develop/taylding-amd_rocprofiler-sdk/the_rock_patch_2
2 parents 4d21b81 + da26938 commit 169e359

File tree

1 file changed

+5
-28
lines changed

1 file changed

+5
-28
lines changed

projects/rocprofiler-sdk/cmake/rocprofiler_config_interfaces.cmake

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -252,35 +252,12 @@ rocprofiler_config_nolink_target(rocprofiler-sdk-hsakmt-nolink hsakmt::hsakmt)
252252
#
253253
# ----------------------------------------------------------------------------------------#
254254

255-
find_path(
256-
drm_INCLUDE_DIR
257-
NAMES drm.h
258-
HINTS ${rocm_version_DIR} ${ROCM_PATH} /opt/amdgpu
259-
PATHS ${rocm_version_DIR} ${ROCM_PATH} /opt/amdgpu
260-
PATH_SUFFIXES include/drm include/libdrm include REQUIRED)
261-
262-
find_path(
263-
xf86drm_INCLUDE_DIR
264-
NAMES xf86drm.h
265-
HINTS ${rocm_version_DIR} ${ROCM_PATH} /opt/amdgpu
266-
PATHS ${rocm_version_DIR} ${ROCM_PATH} /opt/amdgpu
267-
PATH_SUFFIXES include/drm include/libdrm include REQUIRED)
255+
pkg_check_modules(DRM REQUIRED IMPORTED_TARGET libdrm)
256+
pkg_check_modules(DRM_AMDGPU REQUIRED IMPORTED_TARGET libdrm_amdgpu)
268257

269-
find_library(
270-
drm_LIBRARY
271-
NAMES drm
272-
HINTS ${rocm_version_DIR} ${ROCM_PATH} /opt/amdgpu
273-
PATHS ${rocm_version_DIR} ${ROCM_PATH} /opt/amdgpu REQUIRED)
274-
275-
find_library(
276-
drm_amdgpu_LIBRARY
277-
NAMES drm_amdgpu
278-
HINTS ${rocm_version_DIR} ${ROCM_PATH} /opt/amdgpu
279-
PATHS ${rocm_version_DIR} ${ROCM_PATH} /opt/amdgpu REQUIRED)
280-
281-
target_include_directories(rocprofiler-sdk-drm SYSTEM INTERFACE ${drm_INCLUDE_DIR}
282-
${xf86drm_INCLUDE_DIR})
283-
target_link_libraries(rocprofiler-sdk-drm INTERFACE ${drm_LIBRARY} ${drm_amdgpu_LIBRARY})
258+
target_include_directories(rocprofiler-sdk-drm SYSTEM INTERFACE ${DRM_INCLUDE_DIRS}
259+
${DRM_AMDGPU_INCLUDE_DIRS})
260+
target_link_libraries(rocprofiler-sdk-drm INTERFACE PkgConfig::DRM PkgConfig::DRM_AMDGPU)
284261

285262
# ----------------------------------------------------------------------------------------#
286263
#

0 commit comments

Comments
 (0)