Attachment #308977 for bug #411475

View | Details | Raw Unified | Return to bug 411475
Collapse All | Expand All

Lines 113-121 if( NOT KWIN_MOBILE_EFFECTS ) Link Here

(-)a/kwin/effects/CMakeLists.txt (-2 / +2 lines)
113	include( windowgeometry/CMakeLists.txt )	113	include( windowgeometry/CMakeLists.txt )
114	include( zoom/CMakeLists.txt )	114	include( zoom/CMakeLists.txt )
115		115
116	if( NOT KWIN_HAVE_OPENGLES_COMPOSITING )	116	if( NOT OPENGLES_FOUND )
117	include( logout/CMakeLists.txt )	117	include( logout/CMakeLists.txt )
118	endif( NOT KWIN_HAVE_OPENGLES_COMPOSITING )	118	endif( NOT OPENGLES_FOUND )
119	endif( NOT KWIN_MOBILE_EFFECTS )	119	endif( NOT KWIN_MOBILE_EFFECTS )
120		120
121	# OpenGL-specific effects	121	# OpenGL-specific effects




install(TARGETS kcm_kwincompositing  DESTINATION ${PLUGIN_INSTALL_DIR} )

# CompositingPrefs uses OpenGL
if(OPENGL_FOUND)
  target_link_libraries(kcm_kwincompositing kwinglutils ${OPENGL_gl_LIBRARY})
  set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
  # -ldl used by OpenGL code

  if (DL_LIBRARY)
    target_link_libraries(kcm_kwincompositing ${DL_LIBRARY})
  endif(DL_LIBRARY)
endif(OPENGL_FOUND)
if(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)
if (X11_Xrender_FOUND)
  target_link_libraries(kcm_kwincompositing ${X11_Xrender_LIB})
endif (X11_Xrender_FOUND)




install( TARGETS kcm_kwinscreenedges  DESTINATION ${PLUGIN_INSTALL_DIR} )

# CompositingPrefs uses OpenGL
if( OPENGL_FOUND )
  target_link_libraries( kcm_kwinscreenedges kwinglutils ${OPENGL_gl_LIBRARY} )
  set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
# -ldl used by OpenGL code

  if( DL_LIBRARY )
    target_link_libraries( kcm_kwinscreenedges ${DL_LIBRARY} )
  endif( DL_LIBRARY )
endif( OPENGL_FOUND )
if(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)
if( X11_Xrender_FOUND )
  target_link_libraries( kcm_kwinscreenedges ${X11_Xrender_LIB} )
endif( X11_Xrender_FOUND )
- 

Return to bug 411475

Lines 18-24 target_link_libraries(kcm_kwincompositing ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIB Link Here

(-)a/kwin/kcmkwin/kwincompositing/CMakeLists.txt (-4 / +4 lines)
18	install(TARGETS kcm_kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR} )	18	install(TARGETS kcm_kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR} )
19		19
20	# CompositingPrefs uses OpenGL	20	# CompositingPrefs uses OpenGL
21	if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)	21	if(OPENGL_FOUND)
22	target_link_libraries(kcm_kwincompositing kwinglutils ${OPENGL_gl_LIBRARY})	22	target_link_libraries(kcm_kwincompositing kwinglutils ${OPENGL_gl_LIBRARY})
23	set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)	23	set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
24	# -ldl used by OpenGL code	24	# -ldl used by OpenGL code
Lines 26-36 if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING) Link Here
26	if (DL_LIBRARY)	26	if (DL_LIBRARY)
27	target_link_libraries(kcm_kwincompositing ${DL_LIBRARY})	27	target_link_libraries(kcm_kwincompositing ${DL_LIBRARY})
28	endif(DL_LIBRARY)	28	endif(DL_LIBRARY)
29	endif(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)	29	endif(OPENGL_FOUND)
30	if(KWIN_HAVE_OPENGLES_COMPOSITING)	30	if(OPENGLES_FOUND)
31	target_link_libraries(kcm_kwincompositing kwinglesutils ${OPENGLES_LIBRARIES})	31	target_link_libraries(kcm_kwincompositing kwinglesutils ${OPENGLES_LIBRARIES})
32	set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")	32	set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")
33	endif(KWIN_HAVE_OPENGLES_COMPOSITING)	33	endif(OPENGLES_FOUND)
34	if (X11_Xrender_FOUND)	34	if (X11_Xrender_FOUND)
35	target_link_libraries(kcm_kwincompositing ${X11_Xrender_LIB})	35	target_link_libraries(kcm_kwincompositing ${X11_Xrender_LIB})
36	endif (X11_Xrender_FOUND)	36	endif (X11_Xrender_FOUND)

Lines 14-20 target_link_libraries( kcm_kwinscreenedges ${X11_LIBRARIES} kworkspace ${KDE4_PL Link Here

(-)a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt (-5 / +4 lines)
14	install( TARGETS kcm_kwinscreenedges DESTINATION ${PLUGIN_INSTALL_DIR} )	14	install( TARGETS kcm_kwinscreenedges DESTINATION ${PLUGIN_INSTALL_DIR} )
15		15
16	# CompositingPrefs uses OpenGL	16	# CompositingPrefs uses OpenGL
17	if( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )	17	if( OPENGL_FOUND )
18	target_link_libraries( kcm_kwinscreenedges kwinglutils ${OPENGL_gl_LIBRARY} )	18	target_link_libraries( kcm_kwinscreenedges kwinglutils ${OPENGL_gl_LIBRARY} )
19	set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)	19	set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
20	# -ldl used by OpenGL code	20	# -ldl used by OpenGL code
Lines 22-32 if( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING ) Link Here
22	if( DL_LIBRARY )	22	if( DL_LIBRARY )
23	target_link_libraries( kcm_kwinscreenedges ${DL_LIBRARY} )	23	target_link_libraries( kcm_kwinscreenedges ${DL_LIBRARY} )
24	endif( DL_LIBRARY )	24	endif( DL_LIBRARY )
25	endif( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )	25	endif( OPENGL_FOUND )
26	if(KWIN_HAVE_OPENGLES_COMPOSITING)	26	if(OPENGLES_FOUND)
27	target_link_libraries(kcm_kwinscreenedges kwinglesutils ${OPENGLES_LIBRARIES})	27	target_link_libraries(kcm_kwinscreenedges kwinglesutils ${OPENGLES_LIBRARIES})
28	set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")	28	set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")
29	endif(KWIN_HAVE_OPENGLES_COMPOSITING)	29	endif(OPENGLES_FOUND)
30	if( X11_Xrender_FOUND )	30	if( X11_Xrender_FOUND )
31	target_link_libraries( kcm_kwinscreenedges ${X11_Xrender_LIB} )	31	target_link_libraries( kcm_kwinscreenedges ${X11_Xrender_LIB} )
32	endif( X11_Xrender_FOUND )	32	endif( X11_Xrender_FOUND )
33	-