[1/3] cmake: use proper WAYLAND_INCLUDE_DIRS variable

Submitted by Ross Burton on Nov. 30, 2018, 10:45 a.m.

Details

Message ID 20181130104506.4658-1-ross.burton@intel.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

Ross Burton Nov. 30, 2018, 10:45 a.m.
From: Pascal Bach <pascal.bach@siemens.com>

WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly
set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even
when cross compiling.

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
---
 tests/util/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index a5f080156..a303a9f58 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -97,7 +97,7 @@  if(PIGLIT_USE_WAFFLE)
 			piglit-framework-gl/piglit_wl_framework.c
 		)
 		list(APPEND UTIL_GL_INCLUDES
-			${WAYLAND_wayland-client_INCLUDEDIR}
+			${WAYLAND_INCLUDE_DIRS}
 		)
 	endif()
 	if(PIGLIT_HAS_X11)

Comments

Ping.  Also CCing a few people who have touched this file in the past
and might be happy reviewing cmake code!

Ross
On Fri, 30 Nov 2018 at 10:45, Ross Burton <ross.burton@intel.com> wrote:
>
> From: Pascal Bach <pascal.bach@siemens.com>
>
> WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly
> set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even
> when cross compiling.
>
> Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
> ---
>  tests/util/CMakeLists.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
> index a5f080156..a303a9f58 100644
> --- a/tests/util/CMakeLists.txt
> +++ b/tests/util/CMakeLists.txt
> @@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE)
>                         piglit-framework-gl/piglit_wl_framework.c
>                 )
>                 list(APPEND UTIL_GL_INCLUDES
> -                       ${WAYLAND_wayland-client_INCLUDEDIR}
> +                       ${WAYLAND_INCLUDE_DIRS}
>                 )
>         endif()
>         if(PIGLIT_HAS_X11)
> --
> 2.11.0
>
On 12/6/18 2:34 PM, Burton, Ross wrote:
> Ping.  Also CCing a few people who have touched this file in the past
> and might be happy reviewing cmake code!

It seems you forgot the CC part there Ross ...

This change looks fine to me but I've checked and in my build I don't 
see anything in ${WAYLAND_INCLUDE_DIRS} variable (when printing using 
message during cmake), I'm testing this on Fedora. On the other hand it 
seems ${WAYLAND_wayland-client_INCLUDEDIR} is empty as well so I guess 
this is just because the pc file points to the default include path?

Acked-by: Tapani Pälli <tapani.palli@intel.com>


> Ross
> On Fri, 30 Nov 2018 at 10:45, Ross Burton <ross.burton@intel.com> wrote:
>>
>> From: Pascal Bach <pascal.bach@siemens.com>
>>
>> WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly
>> set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even
>> when cross compiling.
>>
>> Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
>> ---
>>   tests/util/CMakeLists.txt | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
>> index a5f080156..a303a9f58 100644
>> --- a/tests/util/CMakeLists.txt
>> +++ b/tests/util/CMakeLists.txt
>> @@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE)
>>                          piglit-framework-gl/piglit_wl_framework.c
>>                  )
>>                  list(APPEND UTIL_GL_INCLUDES
>> -                       ${WAYLAND_wayland-client_INCLUDEDIR}
>> +                       ${WAYLAND_INCLUDE_DIRS}
>>                  )
>>          endif()
>>          if(PIGLIT_HAS_X11)
>> --
>> 2.11.0
>>
> _______________________________________________
> Piglit mailing list
> Piglit@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit
>