summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Gräßlin <mgraesslin@kde.org>2012-05-29 05:59:10 (GMT)
committerMartin Gräßlin <mgraesslin@kde.org>2012-05-31 06:40:25 (GMT)
commit08c10bf6961dbb97e3ff0bc5ae14c3e746ca4980 (patch)
treeec8a3c04c99aff50cf61d9f6aa9682cd0c76f94c
parent19c0fa5abd90a46de2ef6949a15de31111f930f4 (diff)
Fix compilation of KCMs to not link against GLES
If both GL and GLES are present, the KCMs are build against GLES, which is causing trouble. This fixes the changes introduced with 1554ba408633397066d31c3d565c217b5a385fb8. BUG: 300768 FIXED-IN: 4.8.4 REVIEW: 105098
-rw-r--r--kwin/kcmkwin/kwincompositing/CMakeLists.txt5
-rw-r--r--kwin/kcmkwin/kwinscreenedges/CMakeLists.txt5
2 files changed, 4 insertions, 6 deletions
diff --git a/kwin/kcmkwin/kwincompositing/CMakeLists.txt b/kwin/kcmkwin/kwincompositing/CMakeLists.txt
index decc6b7..bd2c128 100644
--- a/kwin/kcmkwin/kwincompositing/CMakeLists.txt
+++ b/kwin/kcmkwin/kwincompositing/CMakeLists.txt
@@ -26,11 +26,10 @@ if(OPENGL_FOUND)
if (DL_LIBRARY)
target_link_libraries(kcm_kwincompositing ${DL_LIBRARY})
endif(DL_LIBRARY)
-endif(OPENGL_FOUND)
-if(OPENGLES_FOUND)
+elseif(OPENGLES_FOUND)
target_link_libraries(kcm_kwincompositing kwinglesutils ${OPENGLES_LIBRARIES})
set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")
-endif(OPENGLES_FOUND)
+endif(OPENGL_FOUND)
if (X11_Xrender_FOUND)
target_link_libraries(kcm_kwincompositing ${X11_Xrender_LIB})
endif (X11_Xrender_FOUND)
diff --git a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
index cecff7c..05a9edc 100644
--- a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
+++ b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
@@ -22,11 +22,10 @@ if( OPENGL_FOUND )
if( DL_LIBRARY )
target_link_libraries( kcm_kwinscreenedges ${DL_LIBRARY} )
endif( DL_LIBRARY )
-endif( OPENGL_FOUND )
-if(OPENGLES_FOUND)
+elseif(OPENGLES_FOUND)
target_link_libraries(kcm_kwinscreenedges kwinglesutils ${OPENGLES_LIBRARIES})
set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")
-endif(OPENGLES_FOUND)
+endif( OPENGL_FOUND )
if( X11_Xrender_FOUND )
target_link_libraries( kcm_kwinscreenedges ${X11_Xrender_LIB} )
endif( X11_Xrender_FOUND )