yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kwin] Use FindEgl for finding egl instead of FindOpenGLES

Browse source 
Requires a2ada35b5c768e8efe9b51a41f84ec6e18ea805c from ECM!
This commit is contained in:
Martin Gräßlin 2014-02-24 14:07:03 +01:00
parent 8b5e4bfcfe
commit 2c7d702b5a
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -54,10 +54,7 @@ if(KWIN_BUILD_OPENGL)
include_directories(${OPENGL_INCLUDE_DIR})
endif()
if(OPENGL_EGL_FOUND)
include_directories(${OPENGLES_EGL_INCLUDE_DIR})
set(KWIN_HAVE_EGL 1)
endif()
set(KWIN_HAVE_EGL ${EGL_FOUND})
if(KWIN_BUILD_OPENGLES)
include_directories(${OPENGLES_INCLUDE_DIR})
@ -311,8 +308,8 @@ if(KWIN_BUILD_ACTIVITIES)
set(kwin_KDE_LIBS ${kwin_KDE_LIBS} KF5::Activities)
endif()
if(OPENGL_EGL_FOUND)
set(kwin_OPENGL_LIBS ${kwin_OPENGL_LIBS} ${OPENGLES_EGL_LIBRARY})
if(KWIN_HAVE_EGL)
set(kwin_OPENGL_LIBS ${kwin_OPENGL_LIBS} EGL::EGL)
endif()
set(kwinLibs

7
libkwineffects/CMakeLists.txt
View file

@ -47,14 +47,11 @@ set(kwin_GLUTILSLIB_SRCS
macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
include_directories(${glinclude})
if(OPENGL_EGL_FOUND)
include_directories(${OPENGLES_EGL_INCLUDE_DIR})
endif()
add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS})
generate_export_header(kwinglutils EXPORT_FILE_NAME kwinglutils_export.h)
target_link_libraries(${name} PUBLIC Qt5::DBus Qt5::X11Extras ${XCB_XCB_LIBRARY})
if(OPENGL_EGL_FOUND)
target_link_libraries(${name} PRIVATE ${OPENGLES_EGL_LIBRARY})
if(KWIN_HAVE_EGL)
target_link_libraries(${name} PRIVATE EGL::EGL)
endif()
set_target_properties(${name} PROPERTIES VERSION 1.0.0 SOVERSION 1 )
target_link_libraries(${name} PUBLIC ${ARGN})