cmake: use pkgconfig to find libva

If user does not set -DLIBVA_INSTALL_PATH, then attempt to find it using pkgconfig. Fixes intel#3 Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
uartie · Dec 4, 2017 · 778c4ce · 778c4ce
1 parent f766254
commit 778c4ce
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt
@@ -55,8 +55,21 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}/../agnostic/share)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../agnostic/hardware)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../linux/share)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../linux/hardware)
+
 if(NOT "${LIBVA_INSTALL_PATH}" STREQUAL "")
     include_directories(BEFORE ${LIBVA_INSTALL_PATH})
+else()
+    include(FindPkgConfig)
+    if(NOT LIBVA_FOUND)
+        pkg_check_modules(LIBVA REQUIRED libva>=1.0.0)
+    endif()
+    if(NOT LIBVA_X11_FOUND)
+        pkg_check_modules(LIBVA_X11 REQUIRED libva-x11>=1.0.0)
+    endif()
+    if(LIBVA_FOUND AND LIBVA_X11_FOUND)
+        include_directories(BEFORE ${LIBVA_INCLUDE_DIRS})
+        include_directories(BEFORE ${LIBVA_X11_INCLUDE_DIRS})
+    endif()
 endif()
 
 

diff --git a/media_driver/cmake/linux/media_include_paths_linux.cmake b/media_driver/cmake/linux/media_include_paths_linux.cmake
@@ -22,6 +22,12 @@ include_directories(${BS_DIR_SKUWA}/linux)
 
 if(NOT "${LIBVA_INSTALL_PATH}" STREQUAL "")
     include_directories(BEFORE ${LIBVA_INSTALL_PATH})
+else()
+    include(FindPkgConfig)
+    pkg_check_modules(LIBVA REQUIRED libva>=1.0.0)
+    if(LIBVA_FOUND)
+        include_directories(BEFORE ${LIBVA_INCLUDE_DIRS})
+    endif()
 endif()