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

All KCMs build again

Browse source
This commit is contained in:
Martin Gräßlin 2010-12-12 12:25:27 +01:00
parent c24fa39acb
commit 5f9b75b0c0
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kcmkwin/CMakeLists.txt
View file

@ -3,10 +3,7 @@ kde4_no_enable_final( kwinoptions )
add_subdirectory( kwinoptions )
add_subdirectory( kwindecoration )
add_subdirectory( kwinrules )
if( NOT KWIN_BUILD_WITH_OPENGLES )
# depends on GL functionality not yet ported to ES
add_subdirectory( kwincompositing )
add_subdirectory( kwinscreenedges )
endif( NOT KWIN_BUILD_WITH_OPENGLES )
add_subdirectory( kwincompositing )
add_subdirectory( kwinscreenedges )
add_subdirectory( kwindesktop )
add_subdirectory( kwintabbox )

9
kcmkwin/kwincompositing/CMakeLists.txt
View file

@ -18,14 +18,17 @@ target_link_libraries(kcm_kwincompositing ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIB
install(TARGETS kcm_kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR} )
# CompositingPrefs uses OpenGL
if(OPENGL_FOUND)
if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
target_link_libraries(kcm_kwincompositing ${OPENGL_gl_LIBRARY})
# -ldl used by OpenGL code
# -ldl used by OpenGL code
find_library(DL_LIBRARY dl)
if (DL_LIBRARY)
target_link_libraries(kcm_kwincompositing ${DL_LIBRARY})
endif(DL_LIBRARY)
endif(OPENGL_FOUND)
endif(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
if(KWIN_HAVE_OPENGLES_COMPOSITING)
target_link_libraries(kcm_kwincompositing ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES})
endif(KWIN_HAVE_OPENGLES_COMPOSITING)
if (X11_Xrender_FOUND)
target_link_libraries(kcm_kwincompositing ${X11_Xrender_LIB})
endif (X11_Xrender_FOUND)

7
kcmkwin/kwinscreenedges/CMakeLists.txt
View file

@ -14,14 +14,17 @@ target_link_libraries( kcm_kwinscreenedges ${X11_LIBRARIES} kworkspace ${KDE4_PL
install( TARGETS kcm_kwinscreenedges DESTINATION ${PLUGIN_INSTALL_DIR} )
# CompositingPrefs uses OpenGL
if( OPENGL_FOUND )
if( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )
target_link_libraries( kcm_kwinscreenedges ${OPENGL_gl_LIBRARY} )
# -ldl used by OpenGL code
find_library( DL_LIBRARY dl )
if( DL_LIBRARY )
target_link_libraries( kcm_kwinscreenedges ${DL_LIBRARY} )
endif( DL_LIBRARY )
endif( OPENGL_FOUND )
endif( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )
if(KWIN_HAVE_OPENGLES_COMPOSITING)
target_link_libraries(kcm_kwinscreenedges ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES})
endif(KWIN_HAVE_OPENGLES_COMPOSITING)
if( X11_Xrender_FOUND )
target_link_libraries( kcm_kwinscreenedges ${X11_Xrender_LIB} )
endif( X11_Xrender_FOUND )