All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Autodetect libdrm path (v2)
@ 2017-02-05 22:24 Tom St Denis
       [not found] ` <20170205222447.19945-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 10+ messages in thread
From: Tom St Denis @ 2017-02-05 22:24 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Tom St Denis

(v2):  Use findLibDRM script instead of directly finding path

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
---
 CMakeLists.txt                 |  3 +++
 cmake_modules/FindLibDRM.cmake | 35 +++++++++++++++++++++++++++++++++++
 src/lib/query_drm.c            |  4 ++--
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 cmake_modules/FindLibDRM.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bef94fdba788..ef78c97ad763 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,9 @@ include_directories(${CURSES_INCLUDE_DIRS})
 find_package(PCIAccess REQUIRED)
 include_directories(${PCIACCESS_INCLUDE_DIR})
 
+find_package(LibDRM REQUIRED)
+include_directories(${LIBDRM_INCLUDE_DIR})
+
 set(REQUIRED_EXTERNAL_LIBS
   ${CURSES_LIBRARIES}
   ${PCIACCESS_LIBRARIES}
diff --git a/cmake_modules/FindLibDRM.cmake b/cmake_modules/FindLibDRM.cmake
new file mode 100644
index 000000000000..e840c4d1bfd0
--- /dev/null
+++ b/cmake_modules/FindLibDRM.cmake
@@ -0,0 +1,35 @@
+# Try to find libdrm
+#
+# Once done, this will define
+#
+# LIBDRM_FOUND
+# LIBDRM_INCLUDE_DIR
+# LIBDRM_LIBRARIES
+
+find_package(PkgConfig)
+
+pkg_check_modules(PC_LIBDRM QUIET libdrm)
+
+find_path(LIBDRM_INCLUDE_DIR NAMES amdgpu_drm.h
+    HINTS
+    ${PC_LIBDRM_INCLUDEDIR}
+    ${PC_LIBDRM_INCLUDE_DIRS}
+    /usr/include
+)
+
+find_library(LIBDRM_LIBRARY NAMES libdrm_amdgpu.so.1
+    HINTS
+    ${PC_LIBDRM_LIBDIR}
+    ${PC_LIBDRM_LIBRARY_DIRS}
+    /usr/lib64
+    /usr/lib
+)
+
+SET(LIBDRM_LIBRARIES optimized ${LIBDRM_LIBRARY})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LIBDRM DEFAULT_MSG
+	LIBDRM_LIBRARIES LIBDRM_INCLUDE_DIR
+)
+
+mark_as_advanced(LIBDRM_INCLUDE_DIR LIBDRM_LIBRARIES)
diff --git a/src/lib/query_drm.c b/src/lib/query_drm.c
index b9d80a8fc0c8..755c65fbc662 100644
--- a/src/lib/query_drm.c
+++ b/src/lib/query_drm.c
@@ -25,8 +25,8 @@
 #include "umr.h"
 #include <asm/ioctl.h>
 #include <sys/ioctl.h>
-#include <drm/drm.h>
-#include <drm/amdgpu_drm.h>
+#include <drm.h>
+#include <amdgpu_drm.h>
 
 #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
 #define DRM_IOC_WRITE           _IOC_WRITE
-- 
2.11.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2017-02-08  0:48 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-05 22:24 [PATCH] Autodetect libdrm path (v2) Tom St Denis
     [not found] ` <20170205222447.19945-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org>
2017-02-05 22:28   ` Andres Rodriguez
     [not found]     ` <62ec2a45-ea86-a643-f7fd-3e5e5054540b-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-02-05 22:42       ` StDenis, Tom
2017-02-06 20:18   ` Emil Velikov
     [not found]     ` <CACvgo5230Use5sk8dm5jBbLqiJeSkgB6cDikz-N4omx-4Jgy9A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-02-06 21:33       ` StDenis, Tom
     [not found]         ` <CY4PR12MB17689AEC15DEF9662A16DEA3F7400-rpdhrqHFk06yjjPBNVDk/QdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-02-06 22:39           ` StDenis, Tom
     [not found]             ` <CY4PR12MB1768AED537A0253EB70B1E4BF7400-rpdhrqHFk06yjjPBNVDk/QdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2017-02-07 11:02               ` Emil Velikov
     [not found]                 ` <CACvgo537ciLvg=Q6enktu6ndMSEuSCM+RpmniJdgYNgZDQjUeQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-02-07 11:30                   ` Tom St Denis
     [not found]                     ` <13f9479c-1a5c-8887-858e-dadf819a7140-5C7GfCeVMHo@public.gmane.org>
2017-02-07 12:41                       ` Emil Velikov
2017-02-08  0:48                       ` Michel Dänzer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.