diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-02-16 08:16:41 +0100 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-02-19 13:15:30 +0100 |
| commit | 7c64db9568296e1caafcfd7163cea3ab1b1626ae (patch) | |
| tree | 995a2fbd553550a1891a93d94d0e6f0309ce4ada | |
| parent | 50e8dd7b2d00d1e8190def778f0fe79aead30b0b (diff) | |
| download | extra-cmake-modules-7c64db9568296e1caafcfd7163cea3ab1b1626ae.tar.gz extra-cmake-modules-7c64db9568296e1caafcfd7163cea3ab1b1626ae.tar.bz2 | |
Fix FindEGL
Summary:
${EGL_INCLUDE_DIR} is the path up to 'egl.h' -- so the header is
${EGL_INCLUDE_DIR}/egl.h
The compile test on the other hand includes 'EGL/egl.h', so the path
that needs to be passed to the compile test is "${EGL_INCLUDE_DIR}/..".
Reviewers: #automotive, hausmann, #freebsd, apol
Reviewed By: #automotive, hausmann, apol
Subscribers: bcooksley, kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D19075
| -rw-r--r-- | find-modules/FindEGL.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/find-modules/FindEGL.cmake b/find-modules/FindEGL.cmake index 5277d123..de271a11 100644 --- a/find-modules/FindEGL.cmake +++ b/find-modules/FindEGL.cmake @@ -75,11 +75,9 @@ set(EGL_DEFINITIONS ${PKG_EGL_CFLAGS_OTHER}) find_path(EGL_INCLUDE_DIR NAMES - egl.h + EGL/egl.h HINTS ${PKG_EGL_INCLUDE_DIRS} - PATH_SUFFIXES - EGL ) find_library(EGL_LIBRARY NAMES @@ -95,7 +93,7 @@ if(EGL_INCLUDE_DIR) # 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 # 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 "[ \t]EGL_VERSION_[0-9_]+" _EGL_version_lines |