1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update FindEGL.cmake from upstream

Browse Source 
Upstream commit 7c64db9568296e1caafcfd7163cea3ab1b1626ae fixed the
suffix path checking and thus the build on FreeBSD.

Change-Id: I0cceeac0639c2899c617ffd6359098d2154acf5b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Simon Hausmann 2019-02-20 10:29:52 +01:00
parent d61b6ea30a
commit 22bd8576cb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake vendored
View File

@ -75,11 +75,9 @@ set(EGL_DEFINITIONS ${PKG_EGL_CFLAGS_OTHER})
find_path(EGL_INCLUDE_DIR find_path(EGL_INCLUDE_DIR
NAMES NAMES
egl.h EGL/egl.h
HINTS HINTS
${PKG_EGL_INCLUDE_DIRS} ${PKG_EGL_INCLUDE_DIRS}
PATH_SUFFIXES
EGL
) )
find_library(EGL_LIBRARY find_library(EGL_LIBRARY
NAMES NAMES
@ -95,7 +93,7 @@ if(EGL_INCLUDE_DIR)
# version; so the header for EGL 1.1 will define EGL_VERSION_1_0 and # version; so the header for EGL 1.1 will define EGL_VERSION_1_0 and
# EGL_VERSION_1_1. Finding the highest supported version involves # EGL_VERSION_1_1. Finding the highest supported version involves
# finding all these defines and selecting the highest numbered. # finding all these defines and selecting the highest numbered.
file(READ "${EGL_INCLUDE_DIR}/egl.h" _EGL_header_contents) file(READ "${EGL_INCLUDE_DIR}/EGL/egl.h" _EGL_header_contents)
string(REGEX MATCHALL string(REGEX MATCHALL
"[ \t]EGL_VERSION_[0-9_]+" "[ \t]EGL_VERSION_[0-9_]+"
_EGL_version_lines _EGL_version_lines