AI/rocm-systems
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dynamic Link Libraries - updates (#23)

Browse Source 
* DRM - deps updates

* Link Libraries - Updates & cleanup

* LibDRM - Find in SLES fix

* Make Test - Fix Failures

[ROCm/rocdecode commit: 2af10a5d80]
This commit is contained in:
Kiriti Gowda authored and GitHub committed 2023-10-25 18:56:36 -04:00
1 parent ea743aa3af
commit 34f1cc3b8f
8 files changed
+57 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

projects/rocdecode/cmake/FindFFmpeg.cmake
+2 -4
View File
@@ -172,11 +172,9 @@ else()
endif()
if(FFMPEG_FOUND)
if(NOT FFMPEG_FIND_QUIETLY)
message("-- ${White}Using FFMPEG -- \n\tLibraries:${FFMPEG_LIBRARIES} \n\tIncludes:${FFMPEG_INCLUDE_DIR}${ColourReset}")
endif()
message("-- ${White}Using FFMPEG -- \n\tLibraries:${FFMPEG_LIBRARIES} \n\tIncludes:${FFMPEG_INCLUDE_DIR}${ColourReset}")
else()
if(FFMPEG_FIND_REQUIRED)
if(FFmpeg_FIND_REQUIRED)
message(FATAL_ERROR "{Red}FindFFmpeg -- libavcodec or libavformat or libavutil NOT FOUND${ColourReset}")
endif()
endif()
projects/rocdecode/cmake/FindLibdrm.cmake
+14 -4
View File
@@ -21,12 +21,22 @@
#
################################################################################
find_package(PkgConfig)
pkg_check_modules(Libdrm libdrm)
find_library(LIBDRM_LIBRARY NAMES drm)
find_path(LIBDRM_INCLUDE_DIR NAMES drm.h PATHS /usr/include/libdrm /usr/include/drm)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libdrm DEFAULT_MSG LIBDRM_INCLUDE_DIR LIBDRM_LIBRARY)
mark_as_advanced(LIBDRM_INCLUDE_DIR LIBDRM_LIBRARY)
if(Libdrm_FOUND)
if(NOT TARGET Libdrm::drm)
add_library(Libdrm::drm UNKNOWN IMPORTED)
set_target_properties(Libdrm::drm PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Libdrm_INCLUDE_DIRS}"
IMPORTED_LOCATION "${Libdrm_LINK_LIBRARIES}")
set_target_properties(Libdrm::drm PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LIBDRM_INCLUDE_DIR}"
IMPORTED_LOCATION "${LIBDRM_LIBRARY}")
endif()
message("-- ${White}Using Libdrm -- \n\tLibraries:${LIBDRM_LIBRARY} \n\tIncludes:${LIBDRM_INCLUDE_DIR}${ColourReset}")
else()
if(Libdrm_FIND_REQUIRED)
message(FATAL_ERROR "{Red}FindLibdrm -- Libdrm NOT FOUND${ColourReset}")
endif()
endif()
projects/rocdecode/cmake/FindLibva.cmake
+5 -8
View File
@@ -21,13 +21,12 @@
#
################################################################################
find_package(Libdrm REQUIRED)
find_library(LIBVA_LIBRARY NAMES va)
find_library(LIBVA_DRM_LIBRARY NAMES va-drm)
find_path(LIBVA_INCLUDE_DIR NAMES va/va.h)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libva DEFAULT_MSG LIBVA_INCLUDE_DIR LIBVA_LIBRARY LIBVA_DRM_LIBRARY)
find_package_handle_standard_args(Libva DEFAULT_MSG LIBVA_INCLUDE_DIR LIBVA_LIBRARY)
mark_as_advanced(LIBVA_INCLUDE_DIR LIBVA_LIBRARY LIBVA_DRM_LIBRARY)
if(Libva_FOUND)
@@ -38,15 +37,13 @@ if(Libva_FOUND)
endif()
if(NOT TARGET Libva::va_drm)
add_library(Libva::va_drm UNKNOWN IMPORTED)
target_link_libraries(Libva::va_drm INTERFACE Libdrm::drm)
set_target_properties(Libva::va_drm PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LIBVA_INCLUDE_DIR}"
IMPORTED_LOCATION "${LIBVA_DRM_LIBRARY}")
endif()
if(NOT Libva_FIND_QUIETLY)
message("-- ${White}Using Libva -- \n\tLibraries:${LIBVA_LIBRARY} \n\tIncludes:${LIBVA_INCLUDE_DIR}${ColourReset}")
IMPORTED_LOCATION "${LIBVA_DRM_LIBRARY}")
endif()
message("-- ${White}Using Libva -- \n\tLibraries:${LIBVA_LIBRARY} \n\tIncludes:${LIBVA_INCLUDE_DIR}${ColourReset}")
message("-- ${White}Using Libva-drm -- \n\tLibraries:${LIBVA_DRM_LIBRARY}${ColourReset}")
else()
if(Libva_FIND_REQUIRED)
message(FATAL_ERROR "{Red}FindLibva -- Libva NOT FOUND${ColourReset}")
endif()
endif()
endif()