Add autodetect for libdrm to umr
While the cmake commits haven't been pushed yet I'd like to get feedback on this patch which helps find the libdrm headers.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 autodetect path to libdrm
--- CMakeLists.txt | 4 +++- src/lib/query_drm.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-)
CMakeLists.txt +3 -1
@@ -25,6 +25,8 @@ include_directories(${CURSES_INCLUDE_DIRS}) find_package(PCIAccess REQUIRED) include_directories(${PCIACCESS_INCLUDE_DIR}) +pkg_check_modules(DRM REQUIRED libdrm) + set(REQUIRED_EXTERNAL_LIBS ${CURSES_LIBRARIES} ${PCIACCESS_LIBRARIES}
@@ -34,7 +36,7 @@ set(REQUIRED_EXTERNAL_LIBS set(CMAKE_POSITION_INDEPENDENT_CODE ON) # CFLAGS += -Wall -W -O2 -g3 -Isrc/ -DPIC -fPIC -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -O2 -g3") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DRM_CFLAGS} -Wall -W -O2 -g3") add_subdirectory(src) add_subdirectory(doc)
src/lib/query_drm.c +2 -2
@@ -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
Signature · 6 lines
2.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH] autodetect path to libdrm
Hey Tom,
Overall in cmake calling pkg_check_modules() directly is usually not a good practice. The common approach is to have a file in cmake/modules/Find$(name).cmake that takes care of everything.
For example, you could use this FindLibdrm.cmake from the KDE project:
https://github.com/KDE/kwin/blob/master/cmake/modules/FindLibdrm.cmake
Alternatively a simple modification of the FindPCIAccess.cmake file that Edward sent out could also work.
Sorry for the late feedback on a Sunday.
Regards,
Andres
Quoted 34 lines · Tom St Denis
Signed-off-by Tom St Denis <[email protected]>--- CMakeLists.txt | 4 +++- src/lib/query_drm.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-)CMakeLists.txt +3
-1@@ -25,6 +25,8 @@ include_directories(${CURSES_INCLUDE_DIRS}) find_package(PCIAccess REQUIRED) include_directories(${PCIACCESS_INCLUDE_DIR}) +pkg_check_modules(DRM REQUIRED libdrm) + set(REQUIRED_EXTERNAL_LIBS ${CURSES_LIBRARIES} ${PCIACCESS_LIBRARIES}@@ -34,7 +36,7 @@ set(REQUIRED_EXTERNAL_LIBS set(CMAKE_POSITION_INDEPENDENT_CODE ON) # CFLAGS += -Wall -W -O2 -g3 -Isrc/ -DPIC -fPIC -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -O2 -g3") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DRM_CFLAGS} -Wall -W -O2 -g3") add_subdirectory(src) add_subdirectory(doc)src/lib/query_drm.c +0
-0
src/lib/query_drm.c line 32
Quoted 10 lines
src/lib/query_drm.c +2
-2@@ -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
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 4fd5d1dd-528c-4f5b-ef87-e2edb42f5e63-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Re: [PATCH] autodetect path to libdrm
Hi Andres,
Oh I can see how that's much simpler than a Makefile [😊] (100 lines of "find libdrm" later...).
I'd rather not wholesale rip off KDE since their license (appears to be BSDish) is different.
I may just clone the one Edward provided as you suggested instead.
Tom
________________________________
From: Andres Rodriguez <[email protected]>
Sent: Sunday, February 5, 2017 16:26
To: Tom St Denis; [email protected]
Cc: StDenis, Tom
Subject: Re: [PATCH] autodetect path to libdrm
Hey Tom,
Overall in cmake calling pkg_check_modules() directly is usually not a good practice. The common approach is to have a file in cmake/modules/Find$(name).cmake that takes care of everything.
For example, you could use this FindLibdrm.cmake from the KDE project:
https://github.com/KDE/kwin/blob/master/cmake/modules/FindLibdrm.cmake
[https://avatars1.githubusercontent.com/u/14312869?v=3&s=400]<https://github.com/KDE/kwin/blob/master/cmake/modules/FindLibdrm.cmake>
KDE/kwin<https://github.com/KDE/kwin/blob/master/cmake/modules/FindLibdrm.cmake> github.com
kwin - This repository has no description
Alternatively a simple modification of the FindPCIAccess.cmake file that Edward sent out could also work.
Sorry for the late feedback on a Sunday.
Regards,
Andres
Quoted 34 lines · Tom St Denis
Signed-off-by Tom St Denis <[email protected]>--- CMakeLists.txt | 4 +++- src/lib/query_drm.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-)CMakeLists.txt +3
-1@@ -25,6 +25,8 @@ include_directories(${CURSES_INCLUDE_DIRS}) find_package(PCIAccess REQUIRED) include_directories(${PCIACCESS_INCLUDE_DIR}) +pkg_check_modules(DRM REQUIRED libdrm) + set(REQUIRED_EXTERNAL_LIBS ${CURSES_LIBRARIES} ${PCIACCESS_LIBRARIES}@@ -34,7 +36,7 @@ set(REQUIRED_EXTERNAL_LIBS set(CMAKE_POSITION_INDEPENDENT_CODE ON) # CFLAGS += -Wall -W -O2 -g3 -Isrc/ -DPIC -fPIC -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -O2 -g3") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DRM_CFLAGS} -Wall -W -O2 -g3") add_subdirectory(src) add_subdirectory(doc)src/lib/query_drm.c +0
-0
src/lib/query_drm.c line 32
Quoted 10 lines
src/lib/query_drm.c +2
-2@@ -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
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CY4PR12MB1768B2057C6F163C69635B4FF7410-rpdhrqHFk06yjjPBNVDk/[email protected]
Re: [PATCH] autodetect path to libdrm
Yeah that approach should be perfectly fine.
I don't think libdrm needs anything fancier than that.
Regards,
Andres
Quoted 93 lines · Tom
Hi Andres,
Oh I can see how that's much simpler than a
Makefile😊 (100 lines of "find libdrm" later...).I'd rather not wholesale rip off KDE since their license (appears to be BSDish) is different.
I may just clone the one Edward provided as you suggested instead.
Tom
------------------------------------------------------------------------
*From:* Andres Rodriguez <[email protected]>
*Sent:* Sunday, February 5, 2017 16:26
*To:* Tom St Denis; [email protected]
*Cc:* StDenis, Tom
*Subject:* Re: [PATCH] autodetect path to libdrmHey Tom,
Overall in cmake calling
pkg_check_modules()directly is usually not a good practice. The common approach is to have a file in cmake/modules/Find$(name).cmake that takes care of everything.For example, you could use this FindLibdrm.cmake from the KDE project:
https://github.com/KDE/kwin/blob/master/cmake/modules/FindLibdrm.cmake
<https://github.com/KDE/kwin/blob/master/cmake/modules/FindLibdrm.cmake>KDE/kwin
<https://github.com/KDE/kwin/blob/master/cmake/modules/FindLibdrm.cmake>
github.com
kwin - This repository has no descriptionAlternatively a simple modification of the FindPCIAccess.cmake file that Edward sent out could also work.
Sorry for the late feedback on a Sunday.
Regards,
AndresQuoted 41 lines · Tom St Denis
Signed-off-by Tom St Denis <[email protected]>--- CMakeLists.txt | 4 +++- src/lib/query_drm.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-)CMakeLists.txt +3
-1@@ -25,6 +25,8 @@ include_directories(${CURSES_INCLUDE_DIRS}) find_package(PCIAccess REQUIRED) include_directories(${PCIACCESS_INCLUDE_DIR}) +pkg_check_modules(DRM REQUIRED libdrm) + set(REQUIRED_EXTERNAL_LIBS ${CURSES_LIBRARIES} ${PCIACCESS_LIBRARIES}@@ -34,7 +36,7 @@ set(REQUIRED_EXTERNAL_LIBS set(CMAKE_POSITION_INDEPENDENT_CODE ON) # CFLAGS += -Wall -W -O2 -g3 -Isrc/ -DPIC -fPIC -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -O2 -g3") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DRM_CFLAGS} -Wall -W -O2 -g3") add_subdirectory(src) add_subdirectory(doc)src/lib/query_drm.c +2
-2@@ -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>
Quoted 3 lines
src/lib/query_drm.c line 32
Quoted 3 lines
src/lib/query_drm.c +0
-0#define DRM_IOC (dir, group, nr, size) _IOC(dir, group, nr, size)#define DRM_IOC_WRITE _IOC_WRITE
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx