x11_egl: use correct cmake variable name for GLES1 include path

This commit reverts most of 7b4a66f99 that included a hack to search
for include directory next to the library path. This was invalid since
used variable name PKG_GLES1_INCLUDE_DIRS is false, correct name is
GLES1_INCLUDE_DIRS which is properly set by the PKG_CHECK_MODULES call.

This change has been succesfully tested on Fedora and Ubuntu distros by
setting up a custom PKG_CONFIG_PATH.

VK-GL-CTS issue: 1573

Change-Id: I158d816d28f5bbf30288f6226bd5c9e30cf85285
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>

diff --git a/targets/x11_egl/x11_egl.cmake b/targets/x11_egl/x11_egl.cmake
index dca529a..6967313 100644 (file)
--- a/targets/x11_egl/x11_egl.cmake
+++ b/targets/x11_egl/x11_egl.cmake
@@ -39,16 +39,7 @@ if (GLES1_LIBRARIES)
        set(DEQP_SUPPORT_GLES1  ON)
        set(DEQP_GLES1_LIBRARIES ${GLES1_LIBRARIES})
        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${GLES1_LIBRARY_DIRS}")
-       if ("${PKG_GLES1_INCLUDE_DIRS}" STREQUAL "")
-               # PKG_GLES1_INCLUDE_DIRS empty, see if matching include
-               # path (GLES/gl.h) exists beside library directory
-               set(GLES1_INCLUDE "${GLES1_LIBDIR}/../include")
-               if (EXISTS ${GLES1_INCLUDE}/GLES/gl.h)
-                       include_directories(${GLES1_INCLUDE})
-               else()
-                       message(FATAL_ERROR "Could not find include path for GLES1 headers")
-               endif (EXISTS ${GLES1_INCLUDE}/GLES/gl.h)
-       endif ("${PKG_GLES1_INCLUDE_DIRS}" STREQUAL "")
+       include_directories(${GLES1_INCLUDE_DIRS})
 endif (GLES1_LIBRARIES)
 
 set(DEQP_PLATFORM_LIBRARIES ${X11_LIBRARIES})