diff options
| author | Junyan He <junyan.he@linux.intel.com> | 2013-11-26 17:59:54 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2013-11-27 16:26:10 +0800 |
| commit | b02b9e7214155dd89b5ed6abdd2895f02ff68795 (patch) | |
| tree | 7fe7423e3abd5a1a78eb4e90408de89b0268dd1b /CMake | |
| parent | 2d5b522b112847daaa8385b7db106d16fc86c8c3 (diff) | |
| download | beignet-b02b9e7214155dd89b5ed6abdd2895f02ff68795.tar.gz | |
Add the drm include and lib path for find when drm is not the system one.
Add the support when the DRM lib is not in the system standard location.
In some cases, we want to debug the libdrm but not want to influence the
whole system.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/FindDRM.cmake | 7 | ||||
| -rw-r--r-- | CMake/FindDRMIntel.cmake | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/CMake/FindDRM.cmake b/CMake/FindDRM.cmake index 3de35bf1..a5a4ebc0 100644 --- a/CMake/FindDRM.cmake +++ b/CMake/FindDRM.cmake @@ -7,7 +7,11 @@ # DRM_LIBRARY # -FIND_PATH(DRM_INCLUDE_PATH drm.h +FIND_PATH(DRM_INCLUDE_PATH + NAMES + drm.h + PATHS + ${CMAKE_INCLUDE_PATH}/include/libdrm/ ~/include/libdrm/ /usr/include/libdrm/ /usr/local/include/libdrm/ @@ -17,6 +21,7 @@ FIND_PATH(DRM_INCLUDE_PATH drm.h FIND_LIBRARY(DRM_LIBRARY NAMES DRM drm PATHS + ${CMAKE_LIBRARY_PATH}/lib/ ~/lib/ /usr/lib64 /usr/lib diff --git a/CMake/FindDRMIntel.cmake b/CMake/FindDRMIntel.cmake index 2d45c642..0aab1c79 100644 --- a/CMake/FindDRMIntel.cmake +++ b/CMake/FindDRMIntel.cmake @@ -6,7 +6,11 @@ # DRM_INTEL_INCLUDE_PATH # -FIND_PATH(DRM_INTEL_INCLUDE_PATH intel_bufmgr.h +FIND_PATH(DRM_INTEL_INCLUDE_PATH + NAMES + intel_bufmgr.h + PATHS + ${CMAKE_INCLUDE_PATH}/include/libdrm/ ~/include/libdrm/ /usr/include/libdrm/ /usr/local/include/libdrm/ @@ -17,6 +21,7 @@ FIND_PATH(DRM_INTEL_INCLUDE_PATH intel_bufmgr.h FIND_LIBRARY(DRM_INTEL_LIBRARY NAMES DRM_INTEL drm_intel PATHS + ${CMAKE_LIBRARY_PATH}/lib/ ~/lib/ /usr/lib64 /usr/lib |