From 8d7a861928ea9a1507802256005890426e2694ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sun, 28 Nov 2010 16:06:46 +0100 Subject: [PATCH] Fix build system for ES --- CMakeLists.txt | 9 +++++++-- lib/CMakeLists.txt | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 334d5a669c..37fa180b6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,7 +160,7 @@ kde4_add_kdeinit_executable( kwin ${kwin_KDEINIT_SRCS}) target_link_libraries(kdeinit_kwin ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTSCRIPT_LIBRARY} kephal kworkspace kdecorations kwineffects ${X11_LIBRARIES}) -if(OPENGL_FOUND) +if(OPENGL_FOUND AND NOT OPENGLES_FOUND) add_subdirectory(opengltest) target_link_libraries(kdeinit_kwin ${OPENGL_gl_LIBRARY}) # -ldl used by OpenGL code @@ -170,7 +170,12 @@ if(OPENGL_FOUND) endif(DL_LIBRARY) # must be after opengl, to be initialized first by the linker target_link_libraries(kdeinit_kwin kwinnvidiahack) -endif(OPENGL_FOUND) +endif(OPENGL_FOUND AND NOT OPENGLES_FOUND) + +if(OPENGLES_FOUND) + add_subdirectory(opengltest) + target_link_libraries(kdeinit_kwin ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES}) +endif(OPENGLES_FOUND) if (X11_Xrandr_FOUND) target_link_libraries(kdeinit_kwin ${X11_Xrandr_LIB}) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 85389a9354..396e905e8f 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -46,7 +46,7 @@ set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 ) install(TARGETS kwineffects EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -if(OPENGL_FOUND) +if(OPENGL_FOUND AND NOT OPENGLES_FOUND) target_link_libraries(kwineffects ${OPENGL_gl_LIBRARY}) target_link_libraries(kwineffects LINK_INTERFACE_LIBRARIES ${OPENGL_gl_LIBRARY}) # -ldl used by OpenGL code @@ -55,7 +55,12 @@ if(OPENGL_FOUND) target_link_libraries(kwineffects ${DL_LIBRARY}) endif(DL_LIBRARY) include_directories(${OPENGL_INCLUDE_DIR}) -endif(OPENGL_FOUND) +endif(OPENGL_FOUND AND NOT OPENGLES_FOUND) +if(OPENGLES_FOUND) + target_link_libraries(kwineffects ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES}) + target_link_libraries(kwineffects LINK_INTERFACE_LIBRARIES ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES}) + include_directories(${OPENGLES_INCLUDE_DIR}) +endif(OPENGLES_FOUND) if (X11_Xrender_FOUND) target_link_libraries(kwineffects ${X11_Xrender_LIB}) endif (X11_Xrender_FOUND)