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

Properly depend on opengl and/or xrender.

Browse source 
svn path=/branches/work/kwin_composite/; revision=652619
This commit is contained in:
Luboš Luňák 2007-04-11 15:31:14 +00:00
parent 8973e88245
commit f285fe4af8
2 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
effects/CMakeLists.txt
View file

@ -3,12 +3,6 @@ macro(KWIN4_ADD_EFFECT name)
kde4_automoc(kwin4_effect_${name} ${ARGN})
kde4_add_plugin(kwin4_effect_${name} ${ARGN})
target_link_libraries(kwin4_effect_${name} kwineffects ${KDE4_KDEUI_LIBS})
if(OPENGL_FOUND)
target_link_libraries(kwin4_effect_${name} ${OPENGL_gl_LIBRARY})
endif(OPENGL_FOUND)
if (X11_Xrender_FOUND)
target_link_libraries(kwin4_effect_${name} ${X11_Xrender_LIB})
endif (X11_Xrender_FOUND)
install(TARGETS kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR})
endmacro(KWIN4_ADD_EFFECT)
@ -25,30 +19,31 @@ SET(kwin4_effect_builtins_sources
if(OPENGL_FOUND)
SET(kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
shadow.cpp
showfps.cpp
)
install( FILES
shadow.desktop
showfps.desktop
DESTINATION ${DATA_INSTALL_DIR}/kwin/effects )
include(UsePkgConfig)
PKGCONFIG(libcaptury CAPTURY_INCLUDES CAPTURY_LINK_DIR CAPTURY_LDFLAGS CAPTURY_CFLAGS)
if( CAPTURY_LDFLAGS )
SET( CAPTURY_FOUND TRUE )
endif( CAPTURY_LDFLAGS )
macro_bool_to_01( CAPTURY_FOUND HAVE_CAPTURY )
if( HAVE_CAPTURY )
KWIN4_ADD_EFFECT(videorecord videorecord.cpp)
target_link_libraries(kwin4_effect_videorecord ${CAPTURY_LDFLAGS})
install( FILES videorecord.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/effects )
endif( HAVE_CAPTURY )
endif(OPENGL_FOUND)
if (X11_Xrender_FOUND)
endif (X11_Xrender_FOUND)
if( OPENGL_FOUND AND X11_Xrender_FOUND )
SET(kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
showfps.cpp
)
install( FILES
showfps.desktop
DESTINATION ${DATA_INSTALL_DIR}/kwin/effects )
endif( OPENGL_FOUND AND X11_Xrender_FOUND )
KWIN4_ADD_EFFECT(builtins ${kwin4_effect_builtins_sources})
if(OPENGL_FOUND)
target_link_libraries(kwin4_effect_builtins ${OPENGL_gl_LIBRARY})
endif(OPENGL_FOUND)
if (X11_Xrender_FOUND)
target_link_libraries(kwin4_effect_builtins ${X11_Xrender_LIB})
endif (X11_Xrender_FOUND)
install( FILES
presentwindows.desktop
@ -56,3 +51,14 @@ install( FILES
zoom.desktop
DESTINATION ${DATA_INSTALL_DIR}/kwin/effects )
include(UsePkgConfig)
PKGCONFIG(libcaptury CAPTURY_INCLUDES CAPTURY_LINK_DIR CAPTURY_LDFLAGS CAPTURY_CFLAGS)
if( CAPTURY_LDFLAGS )
SET( CAPTURY_FOUND TRUE )
endif( CAPTURY_LDFLAGS )
macro_bool_to_01( CAPTURY_FOUND HAVE_CAPTURY )
if( HAVE_CAPTURY )
KWIN4_ADD_EFFECT(videorecord videorecord.cpp)
target_link_libraries(kwin4_effect_videorecord ${CAPTURY_LDFLAGS})
install( FILES videorecord.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/effects )
endif( HAVE_CAPTURY )

2
effects/videorecord.cpp
View file

@ -39,8 +39,6 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kactioncollection.h>
#include <klocale.h>
#include <GL/gl.h>
namespace KWin
{