Skip to content

Commit

Permalink
Fix cmrt build if libva installed at custom location
Browse files Browse the repository at this point in the history
This fix also removes cmrt dependency from libva-x11 which it actually
does not have.

Fixes #63

Change-Id: I85ea2f5b2f330bc1bae77f15e2a32b9a8e4adf9d
Signed-off-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com>
  • Loading branch information
dvrogozh authored and oliver-sang committed Jan 17, 2018
1 parent 8ddc316 commit 5c37e4f
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions cmrtlib/linux/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,12 @@ else()
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)
if(LIBVA_FOUND)
include_directories(BEFORE ${LIBVA_INCLUDE_DIRS})
include_directories(BEFORE ${LIBVA_X11_INCLUDE_DIRS})
link_directories(${LIBVA_LIBRARY_DIRS})
endif()
endif()


include_directories(${MDF_OPTION__LIBVA_INCLUDE_DIR})
link_directories(${MDF_OPTION__LIBVA_LIB_DIR})

# Set up the source files
set(CMRT_SOURCES "")
set(CMRT_DEFINES "")
Expand Down

0 comments on commit 5c37e4f

Please sign in to comment.