[Uml-devel] KDE/kdesdk

[Laurent Montel]

SVN commit 567255 by mlaurent:

Fix CMakeLists.txt


 M  +2 -2      cervisia/cvsservice/CMakeLists.txt  
 M  +4 -1      kbabel/common/CMakeLists.txt  
 M  +2 -1      kbabel/kbabeldict/CMakeLists.txt  
 M  +3 -1      kbabel/xliff/CMakeLists.txt  
 M  +2 -1      kbabel/xliffui/CMakeLists.txt  
 M  +2 -1      kbugbuster/kresources/CMakeLists.txt  
 M  +1 -1      kdeaccounts-plugin/CMakeLists.txt  
 M  +1 -1      kompare/CMakeLists.txt  
 M  +1 -1      kompare/komparenavtreepart/CMakeLists.txt  
 M  +1 -1      kompare/komparepart/CMakeLists.txt  
 M  +1 -1      kprofilemethod/CMakeLists.txt  
 M  +1 -1      kspy/CMakeLists.txt  
 M  +1 -1      kunittest/CMakeLists.txt  
 M  +1 -1      umbrello/umbrello/CMakeLists.txt  


--- trunk/KDE/kdesdk/cervisia/cvsservice/CMakeLists.txt #567254:567255
@@ -35,7 +35,7 @@
 
 kde4_add_kdeinit_executable( cvsaskpass ${cvsaskpass_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_cvsaskpass  ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} kdesu )
+target_link_libraries(kdeinit_cvsaskpass  ${KDE4_KDEUI_LIBS} ${KDE4_KDESU_LIBS} )
 
 install(TARGETS kdeinit_cvsaskpass  DESTINATION ${LIB_INSTALL_DIR} )
 
@@ -51,4 +51,4 @@
 ########### install files ###############
 
 install( FILES  cvsservice.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-install_files( /include FILES  cvsservice_stub.h cvsjob_stub.h repository_stub.h )
+install( FILES  cvsservice_stub.h cvsjob_stub.h repository_stub.h DESTINATION ${INCLUDE_INSTALL_DIR} )
--- trunk/KDE/kdesdk/kbabel/common/CMakeLists.txt #567254:567255
@@ -61,5 +61,8 @@
 install( FILES kbprojectsettings.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
 install( FILES kbabelfilter.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
 install( FILES kbabel-projectrename.upd  DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )
-install_files( /include/kbabel FILES catalog.h catalogitem.h editcmd.h msgfmt.h catalogsettings.h findoptions.h catalogview.h tagextractor.h poinfo.h 	regexpextractor.h itempart.h catalogfileplugin.h kbabeldatatool.h kbproject.h kbprojectmanager.h  	projectsettings.h )
+install( FILES catalog.h catalogitem.h editcmd.h msgfmt.h catalogsettings.h
+    findoptions.h catalogview.h tagextractor.h poinfo.h 	regexpextractor.h itempart.h
+    catalogfileplugin.h kbabeldatatool.h kbproject.h kbprojectmanager.h  	projectsettings.h
+    DESTINATION ${INCLUDE_INSTALL_DIR})
 
--- trunk/KDE/kdesdk/kbabel/kbabeldict/CMakeLists.txt #567254:567255
@@ -40,7 +40,8 @@
 
 install( FILES kbabeldict.desktop  DESTINATION  ${XDG_APPS_DIR} )
 install( FILES kbabeldict_module.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
-install_files( /include/kbabel FILES searchengine.h kbabeldictbox.h kbabeldictiface.h  dictionarymenu.h dictchooser.h  )
+install( FILES searchengine.h kbabeldictbox.h kbabeldictiface.h
+    dictionarymenu.h dictchooser.h DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )
 
--- trunk/KDE/kdesdk/kbabel/xliff/CMakeLists.txt #567254:567255
@@ -29,7 +29,9 @@
 
 ########### install files ###############
 
-install_files(  FILES xliffdocument.h xlifffile.h xliffresource.h  	xliffresourcecontainer.h 	xliffcommon.h xliffgroup.h xlifftransunit.h xliffbinunit.h  		xliffsource.h xlifftarget.h xlifftextelement.h )
+install(  FILES xliffdocument.h xlifffile.h xliffresource.h  	xliffresourcecontainer.h
+    xliffcommon.h xliffgroup.h xlifftransunit.h xliffbinunit.h  		xliffsource.h xlifftarget.h
+    xlifftextelement.h DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 
 
--- trunk/KDE/kdesdk/kbabel/xliffui/CMakeLists.txt #567254:567255
@@ -25,7 +25,8 @@
 
 ########### install files ###############
 
-install_files(  FILES xliffresourcemodel.h xliffresourceitemdelegate.h xliffstructureview.h                       xliffresourceview.h xlifftextedit.h )
+install(  FILES xliffresourcemodel.h xliffresourceitemdelegate.h xliffstructureview.h
+    xliffresourceview.h xlifftextedit.h  DESTINATION ${INCLUDE_INSTALL_DIR})
 
 
 
--- trunk/KDE/kdesdk/kbugbuster/kresources/CMakeLists.txt #567254:567255
@@ -14,7 +14,8 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcal_bugzilla )
 
-target_link_libraries(kcal_bugzilla  ${KDE4_KIO_LIBS} kcal kresources kabc )
+target_link_libraries(kcal_bugzilla  ${KDE4_KIO_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KCAL_LIBS}
+    ${KDE4_KRESOURCES_LIBS} )
 
 install(TARGETS kcal_bugzilla  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
--- trunk/KDE/kdesdk/kdeaccounts-plugin/CMakeLists.txt #567254:567255
@@ -12,7 +12,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kabcformat_kdeaccounts )
 
-target_link_libraries(kabcformat_kdeaccounts  ${KDE4_KDECORE_LIBS} kabc )
+target_link_libraries(kabcformat_kdeaccounts  ${KDE4_KDECORE_LIBS} ${KDE4_KABC_LIBS} )
 
 install(TARGETS kabcformat_kdeaccounts  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
--- trunk/KDE/kdesdk/kompare/CMakeLists.txt #567254:567255
@@ -44,7 +44,7 @@
 
 kde4_add_executable(kompare ${kompare_SRCS})
 
-target_link_libraries(kompare  ${KDE4_KDECORE_LIBS} kparts kompareinterface dialogpages ktexteditor )
+target_link_libraries(kompare  ${KDE4_KPARTS_LIBS} kompareinterface dialogpages ktexteditor )
 
 install(TARGETS kompare  DESTINATION ${BIN_INSTALL_DIR} )
 
--- trunk/KDE/kdesdk/kompare/komparenavtreepart/CMakeLists.txt #567254:567255
@@ -12,7 +12,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} komparenavtreepart )
 
-target_link_libraries(komparenavtreepart  ${KDE4_KDECORE_LIBS} kparts diff2 )
+target_link_libraries(komparenavtreepart  ${KDE4_KPARTS_LIBS} diff2 )
 
 install(TARGETS komparenavtreepart  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
--- trunk/KDE/kdesdk/kompare/komparepart/CMakeLists.txt #567254:567255
@@ -20,7 +20,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} komparepart )
 
-target_link_libraries(komparepart  ${KDE4_KDECORE_LIBS} kparts dialogpages diff2 kompareinterface )
+target_link_libraries(komparepart  ${KDE4_KPARTS_LIBS} dialogpages diff2 kompareinterface )
 
 install(TARGETS komparepart  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
--- trunk/KDE/kdesdk/kprofilemethod/CMakeLists.txt #567254:567255
@@ -4,7 +4,7 @@
 
 ########### install files ###############
 
-install_files( /include FILES kprofilemethod.h )
+install( FILES kprofilemethod.h DESTINATION ${INCLUDE_INSTALL_DIR})
 
 
 
--- trunk/KDE/kdesdk/kspy/CMakeLists.txt #567254:567255
@@ -39,7 +39,7 @@
 
 ########### install files ###############
 
-install_files( /include FILES kspy.h )
+install( FILES kspy.h DESTINATION ${INCLUDE_INSTALL_DIR})
 
 
 
--- trunk/KDE/kdesdk/kunittest/CMakeLists.txt #567254:567255
@@ -37,7 +37,7 @@
 
 ########### install files ###############
 
-install_files( /include/kunittest FILES runnergui.h )
+install( FILES runnergui.h DESTINATION ${INCLUDE_INSTALL_DIR}/kunittest)
 
 
 
--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #567254:567255
@@ -295,7 +295,7 @@
 
 kde4_add_executable(umbrello ${umbrello_SRCS})
 
-target_link_libraries(umbrello  ${KDE4_KIO_LIBS}  kdeprint kde3support xml2 xslt)
+target_link_libraries(umbrello  ${KDE4_KIO_LIBS}  ${KDE4_KDEPRINT_LIBS} kde3support xml2 xslt)
 
 install(TARGETS umbrello  DESTINATION ${BIN_INSTALL_DIR} )