[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace
From:       Andreas Hartmetz <ahartmetz () gmail ! com>
Date:       2008-07-29 12:54:41
Message-ID: 1217336081.006927.466.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 839150 by ahartmetz:

This should fix the rest of kdebase for linking with gold.

 M  +1 -1      kcontrol/input/CMakeLists.txt  
 M  +2 -2      kcontrol/kfontinst/apps/CMakeLists.txt  
 M  +1 -1      kcontrol/randr/CMakeLists.txt  
 M  +2 -2      kdm/kfrontend/CMakeLists.txt  
 M  +5 -2      kscreensaver/krandom_screensaver/CMakeLists.txt  
 M  +4 -1      ksystraycmd/CMakeLists.txt  
 M  +1 -4      kwin/killer/CMakeLists.txt  
 M  +2 -1      libs/plasma/tests/CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/kcontrol/input/CMakeLists.txt #839149:839150
@@ -42,7 +42,7 @@
 kde4_add_executable(kapplymousetheme ${kapplymousetheme_SRCS})
 
 target_link_libraries(kapplymousetheme 
-${KDE4_KDEUI_LIBS} ${X11_Xrender_LIB})
+${KDE4_KDEUI_LIBS} ${X11_Xrender_LIB} ${X11_X11_LIB})
 if (X11_Xcursor_FOUND)
    target_link_libraries(kapplymousetheme ${X11_Xcursor_LIB})
 endif (X11_Xcursor_FOUND)
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/apps/CMakeLists.txt #839149:839150
@@ -16,8 +16,8 @@
 set_target_properties(kfontprint_bin PROPERTIES OUTPUT_NAME kfontprint)
 set_target_properties(kfontview_bin PROPERTIES OUTPUT_NAME kfontview)
 
-target_link_libraries(kfontinst_bin ${KDE4_KIO_LIBS} ${KDE4_KDESU_LIBS} kfontinst )
-target_link_libraries(kfontprint_bin kfontinstui kfontinst )
+target_link_libraries(kfontinst_bin ${KDE4_KIO_LIBS} ${KDE4_KDESU_LIBS} \
${X11_X11_LIB} kfontinst) +target_link_libraries(kfontprint_bin ${X11_X11_LIB} \
kfontinstui kfontinst)  target_link_libraries(kfontview_bin ${KDE4_KPARTS_LIBS} \
kfontinstui kfontinst )  
 install(TARGETS kfontinst_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- trunk/KDE/kdebase/workspace/kcontrol/randr/CMakeLists.txt #839149:839150
@@ -52,7 +52,7 @@
 
 kde4_add_executable(krandrtray ${krandrtray_SRCS})
 
-target_link_libraries(krandrtray  ${KDE4_KUTILS_LIBS} ${X11_Xrandr_LIB} )
+target_link_libraries(krandrtray  ${KDE4_KUTILS_LIBS} ${X11_Xrandr_LIB} \
${X11_LIBRARIES})  
 install(TARGETS krandrtray ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- trunk/KDE/kdebase/workspace/kdm/kfrontend/CMakeLists.txt #839149:839150
@@ -70,7 +70,7 @@
 
 macro_add_file_dependencies(kdm_greet.h ${confci})
 kde4_add_executable(kdm_greet ${kdm_greet_SRCS})
-target_link_libraries(kdm_greet ${KDE4_KDEUI_LIBS} ${POSIX4_LIBRARIES})
+target_link_libraries(kdm_greet ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} \
${X11_X11_LIB} ${POSIX4_LIBRARIES})  if (X11_XTest_FOUND)
   target_link_libraries(kdm_greet ${X11_XTest_LIB})
 endif (X11_XTest_FOUND)
@@ -89,7 +89,7 @@
 
 set(krootimage_SRCS krootimage.cpp krootimage.h ${backgroundlib_SRCS})
 kde4_add_executable(krootimage ${krootimage_SRCS})
-target_link_libraries(krootimage ${KDE4_KDEUI_LIBS} ${QIMAGEBLITZ_LIBRARIES})
+target_link_libraries(krootimage ${KDE4_KDEUI_LIBS} ${X11_X11_LIB} \
${QIMAGEBLITZ_LIBRARIES})  install(TARGETS krootimage DESTINATION \
${LIBEXEC_INSTALL_DIR})  
 set(genkdmconf_SRCS genkdmconf.c)
--- trunk/KDE/kdebase/workspace/kscreensaver/krandom_screensaver/CMakeLists.txt \
#839149:839150 @@ -4,12 +4,15 @@
 
 ########### next target ###############
 
-set(krandom.kss_SRCS random.cpp )
+set(krandom.kss_SRCS random.cpp)
 
 
 kde4_add_executable(krandom.kss ${krandom.kss_SRCS})
 
-target_link_libraries(krandom.kss  ${KDE4_KDEUI_LIBS}  m )
+target_link_libraries(krandom.kss ${KDE4_KDEUI_LIBS} m)
+if (Q_WS_X11)
+  target_link_libraries(krandom.kss ${X11_X11_LIB})
+endif (Q_WS_X11)
 
 install(TARGETS krandom.kss ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- trunk/KDE/kdebase/workspace/ksystraycmd/CMakeLists.txt #839149:839150
@@ -3,6 +3,9 @@
 
 kde4_add_executable(ksystraycmd ${ksystraycmd_SRCS})
 
-target_link_libraries(ksystraycmd  ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDEUI_LIBS} )
+target_link_libraries(ksystraycmd ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDEUI_LIBS})
+if (Q_WS_X11)
+  target_link_libraries(ksystraycmd ${X11_X11_LIB})
+endif (Q_WS_X11)
 
 install(TARGETS ksystraycmd ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/KDE/kdebase/workspace/kwin/killer/CMakeLists.txt #839149:839150
@@ -1,6 +1,3 @@
-
-
-
 ########### next target ###############
 
 set(kwin_killer_helper_SRCS killer.cpp )
@@ -8,6 +5,6 @@
 
 kde4_add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS})
 
-target_link_libraries(kwin_killer_helper  ${KDE4_KDEUI_LIBS} )
+target_link_libraries(kwin_killer_helper ${KDE4_KDEUI_LIBS} ${X11_X11_LIB})
 
 install(TARGETS kwin_killer_helper ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/KDE/kdebase/workspace/libs/plasma/tests/CMakeLists.txt #839149:839150
@@ -3,7 +3,8 @@
 MACRO(PLASMA_UNIT_TESTS)
        FOREACH(_testname ${ARGN})
                kde4_add_unit_test(${_testname} ${_testname}.cpp)
-               target_link_libraries(${_testname} plasma ${QT_QTTEST_LIBRARY})
+               target_link_libraries(${_testname} plasma ${QT_QTTEST_LIBRARY}
+                                     ${KDE4_KIO_LIBRARY})
        ENDFOREACH(_testname)
 ENDMACRO(PLASMA_UNIT_TESTS)
 


[prev in list] [next in list] [prev in thread] [next in thread]