Attachment 131841 Details for Bug 101358 – cmake: Reintroduce version check to gbm_bo_map check

[patch] cmake: Reintroduce version check to gbm_bo_map check

0001-cmake-Reintroduce-version-check-to-gbm_bo_map-check.patch (text/plain), 1.19 KB, created by Jan Vesely on 2017-06-10 12:41:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Vesely

Created: 2017-06-10 12:41:08 UTC

Size: 1.19 KB

patch

obsolete

>From e6e8072cd92e3f605940275e8a57404c4458dd85 Mon Sep 17 00:00:00 2001
>From: Jan Vesely <jano.vesely@gmail.com>
>Date: Sat, 10 Jun 2017 14:31:55 +0200
>Subject: [PATCH] cmake: Reintroduce version check to gbm_bo_map check
>
>Fixes: 2217871ac937 ("CMake: define GBM_BO_MAP only when symbol is found")
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101358
>Signed-off-by: Jan Vesely <jano.vesely@gmail.com>
>---
> CMakeLists.txt | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index cc26fa8be..b4dfe4fcf 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -142,9 +142,11 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
> 		set(PIGLIT_HAS_GBM True)
> 		add_definitions(-DPIGLIT_HAS_GBM)
> 		set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${GBM_LIBRARIES})
>-		CHECK_FUNCTION_EXISTS(gbm_bo_map PIGLIT_HAS_GBM_BO_MAP)
>-		if (PIGLIT_HAS_GBM_BO_MAP)
>-			add_definitions(-DPIGLIT_HAS_GBM_BO_MAP)
>+		if (GBM_VERSION VERSION_EQUAL "12.1" OR GBM_VERSION VERSION_GREATER "12.1")
>+			CHECK_FUNCTION_EXISTS(gbm_bo_map PIGLIT_HAS_GBM_BO_MAP)
>+			if (PIGLIT_HAS_GBM_BO_MAP)
>+				add_definitions(-DPIGLIT_HAS_GBM_BO_MAP)
>+			endif()
> 		endif()
> 	endif(GBM_FOUND)
> 
>-- 
>2.13.0
>

Actions: View | Splinter Review

Attachments on bug 101358: 131826 | 131841

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.