fix link lines

svn path=/trunk/KDE/kdebase/workspace/; revision=829218

clients/b2/CMakeLists.txt

@@ -9,7 +9,7 @@ set(kwin3_b2_PART_SRCS b2client.cpp)
 
 kde4_add_plugin(kwin3_b2 ${kwin3_b2_PART_SRCS})
 
-target_link_libraries(kwin3_b2 kdecorations)
+target_link_libraries(kwin3_b2 kdecorations ${X11_LIBRARIES})
 
 install(TARGETS kwin3_b2  DESTINATION ${PLUGIN_INSTALL_DIR})
 

effects/CMakeLists.txt

@@ -191,9 +191,8 @@ endif(KWIN_HAVE_OPENGL_COMPOSITING)
 KWIN4_ADD_EFFECT(builtins ${kwin4_effect_builtins_sources})
 KWIN4_ADD_EFFECT_CONFIG(builtins ${kwin4_effect_builtins_config_sources})
 # link to xrender if necessary
-# note that libkwineffects already links to opengl, so no need to add this here
 if (KWIN_HAVE_XRENDER_COMPOSITING)
-  target_link_libraries(kwin4_effect_builtins ${X11_Xrender_LIB})
+  target_link_libraries(kwin4_effect_builtins ${X11_Xrender_LIB} ${X11_LIBRARIES})
 endif (KWIN_HAVE_XRENDER_COMPOSITING)
 
 

kcmkwin/kwincompositing/CMakeLists.txt

@@ -11,7 +11,7 @@ set(kcm_kwincompositing_PART_SRCS
     )
 kde4_add_ui_files(kcm_kwincompositing_PART_SRCS advanced.ui main.ui)
 kde4_add_plugin(kcm_kwincompositing ${kcm_kwincompositing_PART_SRCS})
-target_link_libraries(kcm_kwincompositing ${KDE4_KUTILS_LIBS})
+target_link_libraries(kcm_kwincompositing ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
 install(TARGETS kcm_kwincompositing  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 # CompositingPrefs uses OpenGL

kcmkwin/kwindesktop/CMakeLists.txt

@@ -5,7 +5,7 @@ set(kcm_kwindesktop_PART_SRCS desktop.cpp)
 
 kde4_add_plugin(kcm_kwindesktop ${kcm_kwindesktop_PART_SRCS})
 
-target_link_libraries(kcm_kwindesktop  ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS} )
+target_link_libraries(kcm_kwindesktop  ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS} ${X11_LIBRARIES})
 
 install(TARGETS kcm_kwindesktop  DESTINATION ${PLUGIN_INSTALL_DIR} )
 

kcmkwin/kwinrules/CMakeLists.txt

@@ -10,7 +10,7 @@ set(kwin_rules_dialog_KDEINIT_SRCS main.cpp ${kwinrules_SRCS})
 
 kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} )
+target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
 
 install(TARGETS kdeinit_kwin_rules_dialog ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install(TARGETS kwin_rules_dialog         ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -22,7 +22,7 @@ set(kcm_kwinrules_PART_SRCS kcm.cpp ${kwinrules_SRCS})
 
 kde4_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS})
 
-target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} )
+target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
 
 install(TARGETS kcm_kwinrules  DESTINATION ${PLUGIN_INSTALL_DIR} )
 

lib/CMakeLists.txt

@@ -11,11 +11,15 @@ set(kdecorations_LIB_SRCS
 
 kde4_add_library(kdecorations SHARED ${kdecorations_LIB_SRCS})
 
-target_link_libraries(kdecorations  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
+target_link_libraries(kdecorations ${KDE4_KDEUI_LIBS})
 
-set_target_properties(kdecorations PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}  )
+set_target_properties(kdecorations PROPERTIES 
+   VERSION ${GENERIC_LIB_VERSION}
+   SOVERSION ${GENERIC_LIB_SOVERSION}
+   )
 install(TARGETS kdecorations ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
+kde4_target_link_interface_libraries(kdecorations  "${KDE4_KDEUI_LIBS};")
 
 ########### install files ###############
 
@@ -49,6 +53,7 @@ if(OPENGL_FOUND)
   if (DL_LIBRARY)
     target_link_libraries(kwineffects ${DL_LIBRARY})
   endif(DL_LIBRARY)
+  kde4_target_link_interface_libraries(kwineffects "${OPENGL_gl_LIBRARY};")
 endif(OPENGL_FOUND)
 if (X11_Xrender_FOUND)
   target_link_libraries(kwineffects ${X11_Xrender_LIB})

lib/kwineffects.cpp

@@ -881,6 +881,7 @@ QRect PaintClipper::Iterator::boundingRect() const
         return paintArea().boundingRect();
 #endif
     abort();
+    return infiniteRegion();
     }