D19075: Fix FindEGL

[David Faure]

dfaure added a comment.


  If anyone hits a cmake error about "/usr/include/EGL/EGL/egl.h" after 
updating ECM (e.g. in kwayland or plasma-framework), remove the cache in the 
builddir and rerun cmake. This commit is actually correct, it's just 
incompatible with existing caches.

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann, #freebsd, apol
Cc: dfaure, bcooksley, kde-frameworks-devel, kde-buildsystem, michaelh, 
ngraham, bruns

D19075: Fix FindEGL

[Tobias C. Berner]

This revision was automatically updated to reflect the committed changes.
Closed by commit R240:7c64db956829: Fix FindEGL (authored by tcberner).

REPOSITORY
  R240 Extra CMake Modules

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D19075?vs=51847=52057

REVISION DETAIL
  https://phabricator.kde.org/D19075

AFFECTED FILES
  find-modules/FindEGL.cmake

To: tcberner, #automotive, hausmann, #freebsd, apol
Cc: bcooksley, kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Ben Cooksley]

bcooksley added a comment.


  If someone could please trigger all of the Dependency Builds for FreeBSD once 
this has been landed that would be appreciated: 
https://build.kde.org/view/Failing/

REPOSITORY
  R240 Extra CMake Modules

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann, #freebsd, apol
Cc: bcooksley, kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Aleix Pol Gonzalez]

apol accepted this revision.

REPOSITORY
  R240 Extra CMake Modules

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann, #freebsd, apol
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Simon Hausmann]

hausmann accepted this revision.
hausmann added a comment.
This revision is now accepted and ready to land.


  Thank you:)

REPOSITORY
  R240 Extra CMake Modules

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann, #freebsd
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Tobias C. Berner]

tcberner updated this revision to Diff 51847.
tcberner added a comment.


  Simply set `NAMES EGL/egl.h` and fixup the header version check.

REPOSITORY
  R240 Extra CMake Modules

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D19075?vs=51842=51847

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D19075

AFFECTED FILES
  find-modules/FindEGL.cmake

To: tcberner, #automotive, hausmann, #freebsd
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Tobias C. Berner]

tcberner added a comment.


  In D19075#413462 , @hausmann wrote:
  
  > I think that it should be NAMES EGL/egl.h
  
  
  Yeah, then it might actuayll work without redefining the path -- but in both 
cases we are kind of assuming that all install egl.h into a subdir called 'EGL'.

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann, #freebsd
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Simon Hausmann]

hausmann added a comment.


  I think that it should be NAMES EGL/egl.h

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann, #freebsd
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Tobias C. Berner]

tcberner updated this revision to Diff 51842.
tcberner added a comment.


  Store the path gathered via pkgconfig in `COMPLETE_EGL_INCLUDE_DIR` and 
  use its parent directory for `EGL_INCLUDE_DIR`.

REPOSITORY
  R240 Extra CMake Modules

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D19075?vs=51825=51842

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D19075

AFFECTED FILES
  find-modules/FindEGL.cmake

To: tcberner, #automotive, hausmann, #freebsd
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Simon Hausmann]

hausmann requested changes to this revision.
This revision now requires changes to proceed.

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann, #freebsd
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Simon Hausmann]

hausmann added a comment.


  Yeah I think find_path should use the same style as the test program 
(EGL/egl.h). It is the style of inclusion as per the specification. I think 
that’s better than the ../ approach.

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann, #freebsd
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Tobias C. Berner]

tcberner added a comment.


  Possibly the returend `EGL_INCLUDE_DIR` should possibly be stripped of the 
suffix too, as most will proably include 'EGL/egl.h', and not 'egl.h', I guess?

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann, #freebsd
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Tobias C. Berner]

tcberner added a reviewer: FreeBSD.

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann, #freebsd
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Tobias C. Berner]

tcberner created this revision.
tcberner added reviewers: Automotive, hausmann.
Herald added projects: Frameworks, Build System.
Herald added subscribers: kde-buildsystem, kde-frameworks-devel.
tcberner requested review of this revision.

REVISION 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}/..".

REPOSITORY
  R240 Extra CMake Modules

BRANCH
  master

REVISION DETAIL
  https://phabricator.kde.org/D19075

AFFECTED FILES
  find-modules/FindEGL.cmake

To: tcberner, #automotive, hausmann
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D19075: Fix FindEGL

[Tobias C. Berner]

tcberner added a dependency: D18960: Add compile check to FindEGL.

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D19075

To: tcberner, #automotive, hausmann
Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns