diff --git a/gpgme++/CMakeLists.txt b/gpgme++/CMakeLists.txt
index 871698215..6bf58a9f7 100644
--- a/gpgme++/CMakeLists.txt
+++ b/gpgme++/CMakeLists.txt
@@ -1,143 +1,134 @@
 project( gpgmepp )
 
 include_directories(  ${GPGME_INCLUDES} )
 add_definitions( ${KDE4_ENABLE_EXCEPTIONS} )
 
-if (WIN32)
-# overriding LIB_INSTALL_DIR specific for win32 to archieve 
-# propper installation of shared library targets will also be 
-# used in install(FILES ...) which fails with error
-# 'INSTALL FILES given unknown argument "RUNTIME".'
-# There must be a way to only patch install(TARGETS) 
-    set (LIB_INSTALL_DIR lib)
-endif (WIN32)
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-gpgme++.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-gpgme++.h )
 
 ## gpgme comes in three flavours on each of the platforms:
 ##  Windows: gpgme, gpgme-glib, gpgme-qt
 ##     Unix: gpgme, gpgme-pthread, gpgme-pth
 ## We're building corresponding gpgme++ flavours
 
 set(gpgme_LIB_SRCS 
         exception.cpp
 	context.cpp key.cpp 
 	trustitem.cpp 
 	data.cpp 
 	callbacks.cpp 
 	eventloopinteractor.cpp 
         editinteractor.cpp
 	keylistresult.cpp            
 	keygenerationresult.cpp 
 	importresult.cpp
 	decryptionresult.cpp 
 	verificationresult.cpp 
 	signingresult.cpp 
 	encryptionresult.cpp 
 	engineinfo.cpp
         gpgsetexpirytimeeditinteractor.cpp
         gpgsetownertrusteditinteractor.cpp
 )
 
 set( _gpgmepp_version 1.1.0 )
 
 set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} )
 
 if ( GPGME_VANILLA_FOUND )
    kde4_add_library( gpgmepp SHARED ${gpgme_LIB_SRCS} context_vanilla.cpp )
    target_link_libraries( gpgmepp ${GPGME_VANILLA_LIBRARIES} )
    set_target_properties( gpgmepp PROPERTIES
     VERSION     ${_gpgmepp_version}
     SOVERSION   ${_gpgmepp_version}
     OUTPUT_NAME gpgme++
    )
    get_target_property( GPGMEPP_VANILLA_LIBRARY gpgmepp LOCATION )
    install(TARGETS gpgmepp DESTINATION ${LIB_INSTALL_DIR} )
 endif ( GPGME_VANILLA_FOUND )
 
 if ( GPGME_GLIB_FOUND )
    kde4_add_library( gpgmepp-glib SHARED ${gpgme_LIB_SRCS} context_glib.cpp )
    target_link_libraries( gpgmepp-glib ${GPGME_GLIB_LIBRARIES} )
    set_target_properties( gpgmepp-glib PROPERTIES
     VERSION     ${_gpgmepp_version}
     SOVERSION   ${_gpgmepp_version}
     OUTPUT_NAME gpgme++-glib DEFINE_SYMBOL MAKE_GPGME___LIB
    )
    get_target_property( GPGMEPP_GLIB_LIBRARY gpgmepp LOCATION )
    install(TARGETS gpgmepp-glib DESTINATION ${LIB_INSTALL_DIR} )
 endif ( GPGME_GLIB_FOUND )
 
 if ( GPGME_QT_FOUND )
    kde4_add_library( gpgmepp-qt SHARED ${gpgme_LIB_SRCS} context_qt.cpp )
    if(WIN32)
    target_link_libraries( gpgmepp-qt ${GPGME_QT_LIBRARIES} ${GPGME_VANILLA_LIBRARIES} )
    ELSE(WIN32)
     target_link_libraries( gpgmepp-qt ${GPGME_QT_LIBRARIES} )
    ENDIF(WIN32)
    set_target_properties( gpgmepp-qt PROPERTIES
     VERSION     ${_gpgmepp_version}
     SOVERSION   ${_gpgmepp_version}
     OUTPUT_NAME gpgme++-qt DEFINE_SYMBOL MAKE_GPGME___LIB
    )
    get_target_property( GPGMEPP_QT_LIBRARY gpgmepp LOCATION )
    install(TARGETS gpgmepp-qt DESTINATION ${LIB_INSTALL_DIR})
 endif ( GPGME_QT_FOUND )
 
 if ( GPGME_PTHREAD_FOUND )
    kde4_add_library( gpgmepp-pthread SHARED ${gpgme_LIB_SRCS} context_vanilla.cpp )
    target_link_libraries( gpgmepp-pthread ${GPGME_PTHREAD_LIBRARIES} )
    set_target_properties( gpgmepp-pthread PROPERTIES
     VERSION     ${_gpgmepp_version}
     SOVERSION   ${_gpgmepp_version}
     OUTPUT_NAME gpgme++-pthread DEFINE_SYMBOL MAKE_GPGME___LIB
    )
    get_target_property( GPGMEPP_PTHREAD_LIBRARY gpgmepp LOCATION )
    install(TARGETS gpgmepp-pthread DESTINATION ${LIB_INSTALL_DIR} )
 endif ( GPGME_PTHREAD_FOUND )
 
 if ( GPGME_PTH_FOUND )
    kde4_add_library( gpgmepp-pth SHARED ${gpgme_LIB_SRCS} context_vanilla.cpp )
    target_link_libraries( gpgmepp-pth ${GPGME_PTH_LIBRARIES} )
    set_target_properties( gpgmepp-pth PROPERTIES
     VERSION     ${_gpgmepp_version}
     SOVERSION   ${_gpgmepp_version}
     OUTPUT_NAME gpgme++-pth DEFINE_SYMBOL MAKE_GPGME___LIB
    )
    get_target_property( GPGMEPP_PTH_LIBRARY gpgmepp LOCATION )
    install(TARGETS gpgmepp-pth DESTINATION ${LIB_INSTALL_DIR} )
 endif ( GPGME_PTH_FOUND )
 
 
 include( CMakeExportBuildSettings )
 # this writes way too much, but do we care?
 EXPORT_LIBRARY_DEPENDENCIES( ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppLibraryDepends.cmake )
 
 ########### install files ###############
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GpgmeppConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppConfig.cmake @ONLY )
 
 if ( GPGME_FOUND )
 
    add_subdirectory( interfaces )
 
    install(
      FILES
         global.h error.h exception.h context.h key.h trustitem.h 
         eventloopinteractor.h editinteractor.h data.h gpgmefw.h result.h
         keylistresult.h keygenerationresult.h 
         importresult.h decryptionresult.h verificationresult.h
         signingresult.h encryptionresult.h notation.h engineinfo.h
         gpgsetexpirytimeeditinteractor.h
         gpgsetownertrusteditinteractor.h
         gpgme++_export.h 
      DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++
    )
 
    install(
      FILES
      ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppConfig.cmake
      ${CMAKE_CURRENT_BINARY_DIR}/GpgmeppLibraryDepends.cmake
      DESTINATION
      ${LIB_INSTALL_DIR}/gpgmepp )
 
 endif ( GPGME_FOUND )
diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt
index 4ee1dff2d..2b8199e88 100644
--- a/kabc/CMakeLists.txt
+++ b/kabc/CMakeLists.txt
@@ -1,137 +1,133 @@
 
 project(kabc)
 
 include_directories( ${KDE4_KIO_INCLUDES} )
 
 add_definitions(${QDBUS_DEFINITIONS} -DKDE_DEFAULT_DEBUG_AREA=5700 )
 
 # these apply also for all subdirs
 include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/kab
  ${CMAKE_CURRENT_BINARY_DIR}/kab
  ${CMAKE_CURRENT_SOURCE_DIR}/vcardparser
 )
 
 # kabc/vcardparser/Makefile.am: vcards
 
 set(vcards_STAT_SRCS
   vcardparser/vcard.cpp
   vcardparser/vcardline.cpp
   vcardparser/vcardparser.cpp
 )
 
 add_subdirectory( vcardparser )
 add_subdirectory( formats )
 add_subdirectory( plugins )
 add_subdirectory( tests )
 #add_subdirectory( scripts )
 FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts)
 
 
 
 add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/field.cpp ${CMAKE_CURRENT_BINARY_DIR}/addressee.h ${CMAKE_CURRENT_BINARY_DIR}/addressee.cpp
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts
    COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/makeaddressee
    DEPENDS  
    scripts/makeaddressee
    scripts/addressee.src.cpp
    scripts/addressee.src.h
    scripts/entrylist
    scripts/field.src.cpp
    )
 
 
 ########### next target ###############
 
 set(kabc_LIB_SRCS
    address.cpp
    addressbook.cpp
    ${CMAKE_CURRENT_BINARY_DIR}/addressee.cpp
    ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
    ${CMAKE_CURRENT_BINARY_DIR}/field.cpp
    addresseedialog.cpp
    distributionlist.cpp
    distributionlistdialog.cpp
    emailselectdialog.cpp
    errorhandler.cpp
    formatfactory.cpp
    geo.cpp
    key.cpp
    phonenumber.cpp
    picture.cpp
    plugin.cpp
    resource.cpp
    resourceabc.cpp
    resourcecached.cpp
    secrecy.cpp
    sound.cpp
    stdaddressbook.cpp
    vcardconverter.cpp
    timezone.cpp
    vcardformat.cpp
    ldifconverter.cpp
    addresslineedit.cpp
    addresseelist.cpp
    vcardtool.cpp
    addresseehelper.cpp
    lock.cpp
    locknull.cpp
    sortmode.cpp
    ${vcards_STAT_SRCS}
 )
 
 
 kde4_add_library(kabc SHARED ${kabc_LIB_SRCS})
 
 target_link_libraries(kabc kresources kldap ${KDE4_KDE3SUPPORT_LIBRARY})
 
 set_target_properties(kabc PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kabc  
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kabc DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 
 install( FILES countrytransl.map  DESTINATION  ${DATA_INSTALL_DIR}/kabc )
 install( FILES kabc_manager.desktop  DESTINATION  ${SERVICES_INSTALL_DIR}/kresources )
 install( FILES
    kabc_export.h
    address.h
    addressbook.h
    ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
    addresseelist.h
    addresseedialog.h
    distributionlist.h
    distributionlistdialog.h
    emailselectdialog.h
    errorhandler.h
    field.h
    format.h
    formatfactory.h
    format.h
    geo.h
    key.h
    phonenumber.h
    picture.h
    plugin.h
    resource.h
    resourceabc.h
    resourcecached.h
    secrecy.h
    sound.h
    stdaddressbook.h
    timezone.h
    vcardformat.h
    vcardconverter.h
    ldifconverter.h
    addresslineedit.h
    addresseelist.h
    lock.h
    locknull.h
    sortmode.h
 DESTINATION ${INCLUDE_INSTALL_DIR}/kabc)
 
diff --git a/kabc/plugins/file/CMakeLists.txt b/kabc/plugins/file/CMakeLists.txt
index 15d45347d..0475c7134 100644
--- a/kabc/plugins/file/CMakeLists.txt
+++ b/kabc/plugins/file/CMakeLists.txt
@@ -1,37 +1,33 @@
 
 include_directories( ${CMAKE_SOURCE_DIR}/kabc )
 
 
 ########### kabc_file_core library (also used by kaddressbook) ###############
 
 set(kabc_file_core_SRCS resourcefile.cpp resourcefileconfig.cpp )
 
 
 kde4_add_library(kabc_file_core SHARED ${kabc_file_core_SRCS})
 
 target_link_libraries(kabc_file_core ${KDE4_KDECORE_LIBS} kabc)
 
 set_target_properties(kabc_file_core PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
-install(TARGETS kabc_file_core  
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kabc_file_core DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### kabc_file plugin ###############
 
 set(kabc_file_SRCS resourcefileplugin.cpp)
 
 
 kde4_add_plugin(kabc_file ${kabc_file_SRCS})
 
 target_link_libraries(kabc_file ${KDE4_KDECORE_LIBS} kabc_file_core)
 
 
 install(TARGETS kabc_file  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
 ########### install files ###############
 
 install( FILES file.desktop  DESTINATION  ${SERVICES_INSTALL_DIR}/kresources/kabc )
diff --git a/kblog/CMakeLists.txt b/kblog/CMakeLists.txt
index fdec6f219..3792eacdf 100644
--- a/kblog/CMakeLists.txt
+++ b/kblog/CMakeLists.txt
@@ -1,37 +1,33 @@
 project(kblog)
 
 include_directories(${Boost_INCLUDE_DIR})
 
 add_subdirectory( tests )
 
 ########### next target ###############
 
 set(kblog_LIB_SRCS
 blog.cpp
 blogpost.cpp
 blogcomment.cpp
 blogmedia.cpp
 blogger1.cpp
 gdata.cpp
 # livejournal.cpp
 metaweblog.cpp
 movabletype.cpp
 wordpressbuggy.cpp
 )
 
 
 kde4_add_library(kblog SHARED ${kblog_LIB_SRCS})
 
 target_link_libraries(kblog kxmlrpcclient syndication ${KDE4_KIO_LIBS} kcal )
 
 set_target_properties(kblog PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
-install(TARGETS kblog  
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kblog DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ##############
 
 install( FILES kblog_export.h blog.h blogpost.h blogcomment.h blogmedia.h blogger1.h gdata.h metaweblog.h movabletype.h wordpressbuggy.h DESTINATION ${INCLUDE_INSTALL_DIR}/kblog)
diff --git a/kcal/CMakeLists.txt b/kcal/CMakeLists.txt
index b1d934252..efb3d0657 100644
--- a/kcal/CMakeLists.txt
+++ b/kcal/CMakeLists.txt
@@ -1,354 +1,350 @@
 project(kcal)
 
 # was used by libical, but not anymore
 #if (UNIX)
 #  add_definitions(-DICAL_UNIX_NEWLINE=1)
 #endif (UNIX)
 
 ADD_DEFINITIONS(-DPACKAGE_DATA_DIR=\\""${DATA_INSTALL_DIR}/libical"\\" ) # added manually
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5800)
 
 include (ConfigureChecks.cmake)
 configure_file (libical/config-libical.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/libical/config-libical.h)
 
 if(KDE4_BUILD_TESTS)
     add_definitions(-DCOMPILING_TESTS)
 endif(KDE4_BUILD_TESTS)
 
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/libical/src/libicalss/
 	${CMAKE_CURRENT_BINARY_DIR}/libical/src/libicalss/
 	${CMAKE_CURRENT_SOURCE_DIR}/versit/
 	${CMAKE_CURRENT_SOURCE_DIR}/libical/src/libical/
 	${CMAKE_CURRENT_BINARY_DIR}/libical/src/libical/
 	${CMAKE_CURRENT_BINARY_DIR}/libical # for config.h
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/kabc
 	${CMAKE_BINARY_DIR}/kabc
         ${KDE4_INCLUDE_DIR}
 )
 
 set(ICALSCRIPTS ${CMAKE_SOURCE_DIR}/kcal/libical/scripts/ )
 
 set(PROPERTYDEPS 
 	${ICALSCRIPTS}/mkderivedproperties.pl 
 	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv	
 	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv
 	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.h.in 
 	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.c.in 
 )
 
 add_custom_command(OUTPUT
 ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
 COMMAND ${PERL_EXECUTABLE} ARGS -I ${ICALSCRIPTS}
 ${ICALSCRIPTS}/mkderivedproperties.pl -i
 ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.h.in
 -h  ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h   DEPENDS  ${PROPERTYDEPS} )
 
 
 add_custom_command(OUTPUT
 ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c
 COMMAND ${PERL_EXECUTABLE} ARGS -I${ICALSCRIPTS}
 ${ICALSCRIPTS}/mkderivedproperties.pl -i
 ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedproperty.c.in
 -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/properties.csv
 ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c   DEPENDS  ${PROPERTYDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h )
 
 
 # files generated via add_custom_command are added automatically to the clean files, Alex
 #macro_additional_clean_files( 
 #                              ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c 
 #                              ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h 
 #)
 
 
 set(PARAMETERDEPS 
 	${ICALSCRIPTS}/mkderivedparameters.pl 
 	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv 
 	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.c.in
 	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.h.in
 )
 
 add_custom_command(OUTPUT
 ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
 COMMAND ${PERL_EXECUTABLE} ARGS -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedparameters.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.h.in -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h   DEPENDS  ${PARAMETERDEPS} )
 
 add_custom_command(OUTPUT
 ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c
 COMMAND ${PERL_EXECUTABLE} ARGS -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedparameters.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedparameter.c.in -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/parameters.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c   DEPENDS  ${PARAMETERDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h )
 
 #files generated via add_custom_command are added automatically to the clean files, Alex
 #macro_additional_clean_files( 
 #	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c 
 #	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h 
 #)
 
 
 set(RESTRICTIONDEPS 
 	${ICALSCRIPTS}/mkrestrictiontable.pl
 	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/restrictions.csv
 	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrestriction.c.in
 )
 
 add_custom_command(OUTPUT
 ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c
 COMMAND ${PERL_EXECUTABLE} ARGS -I ${ICALSCRIPTS} ${ICALSCRIPTS}/mkrestrictiontable.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrestriction.c.in ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/restrictions.csv > ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c   DEPENDS  ${RESTRICTIONDEPS} )
 
 
 #files generated via add_custom_command are added automatically to the clean files, Alex
 #macro_additional_clean_files( ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c)
 
 set(VALUEDEPS
 	${CMAKE_SOURCE_DIR}/kcal/libical/scripts/mkderivedvalues.pl
 	${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv
 	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.c.in
 	${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.h.in
 )
 
 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h COMMAND ${PERL_EXECUTABLE} ARGS -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedvalues.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.h.in -h ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h   DEPENDS  ${VALUEDEPS} )
 
 
 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c COMMAND ${PERL_EXECUTABLE} ARGS -I${ICALSCRIPTS} ${ICALSCRIPTS}/mkderivedvalues.pl -i ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalderivedvalue.c.in -c ${CMAKE_SOURCE_DIR}/kcal/libical/design-data/value-types.csv > ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c   DEPENDS  ${VALUEDEPS} ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h )
 
 #files generated via add_custom_command are added automatically to the clean files, Alex
 #macro_additional_clean_files(
 #	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
 #	${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c
 #)
 
 
 
 set(libversit_SRCS 
    ${CMAKE_SOURCE_DIR}/kcal/versit/vcc.c 
    ${CMAKE_SOURCE_DIR}/kcal/versit/vobject.c 
 )
 
 # Keep absolute paths here, they are used in tests/CMakeLists.txt too.
 set(libical_SRCS
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/caldate.c       
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalarray.c     
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalattach.c        
    ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.c  
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalrecur.c     
    ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/icalrestriction.c   
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalcomponent.c     
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalenums.c     
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalerror.c     
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalmemory.c        
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalmime.c      
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalparameter.c    
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalparser.c        
    ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.c   
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalproperty.c      
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltime.c      
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalduration.c      
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalperiod.c        
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltimezone.c      
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icaltypes.c     
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/icalvalue.c     
    ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.c  
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/pvl.c           
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/sspm.c          
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libical/vsnprintf.c     
 )
 
 set(libicalss_SRCS
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libicalss/icalclassify.c      
    ${CMAKE_SOURCE_DIR}/kcal/libical/src/libicalss/icalclassify.h      
 )
 
 
 macro_additional_clean_files(${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h)
 
 if(WIN32)
   set(TOPS "\"${CMAKE_SOURCE_DIR}\"")
   set(TOPB "\"${CMAKE_BINARY_DIR}\"")
 else(WIN32)
   set(TOPS "${CMAKE_SOURCE_DIR}")
   set(TOPB "${CMAKE_BINARY_DIR}")
 endif(WIN32)
 add_custom_command(OUTPUT
    ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h 
    COMMAND 
    ${CMAKE_COMMAND} 
    -DTOPS:FILEPATH=${TOPS}
    -DTOPB:FILEPATH=${TOPB}
    -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
    -P ${CMAKE_SOURCE_DIR}/kcal/ical_file.cmake
    DEPENDS
    ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedproperty.h
    ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedparameter.h
    ${CMAKE_BINARY_DIR}/kcal/libical/icalderivedvalue.h
 )
 
 macro_additional_clean_files(${CMAKE_BINARY_DIR}/libical/src/libicalss/icalss.h)
 
 add_custom_command(OUTPUT
    ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h 
    COMMAND 
    ${CMAKE_COMMAND} 
    -DTOP:FILEPATH=${TOPS}
    -DKDE_FILE_H_FILE:FILEPATH=${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
    -P ${CMAKE_SOURCE_DIR}/kcal/icalss_file.cmake
 )
 
 
 ########### next target ###############
 
 set(kcal_LIB_SRCS ${libversit_SRCS} ${libical_SRCS} ${libicalss_SRCS}
    incidencebase.cpp
    incidence.cpp
    journal.cpp
    todo.cpp
    event.cpp
    freebusy.cpp
    attendee.cpp
    attachment.cpp
    recurrencerule.cpp
    recurrence.cpp
    alarm.cpp
    customproperties.cpp
    calendar.cpp
    calendarlocal.cpp
    calformat.cpp
    vcalformat.cpp
    icalformat.cpp
    icalformat_p.cpp
    incidenceformatter.cpp
    vcaldrag.cpp
    icaldrag.cpp
    exceptions.cpp
    scheduler.cpp
    imipscheduler.cpp
    dummyscheduler.cpp
    calfilter.cpp
    person.cpp
    period.cpp
    duration.cpp
    dndfactory.cpp
    calstorage.cpp
    filestorage.cpp
    compat.cpp
    resourcecalendar.cpp
    resourcelocal.cpp
    resourcelocalconfig.cpp
    resourcelocaldir.cpp
    resourcelocaldirconfig.cpp
    resourcecached.cpp
    resourcecachedconfig.cpp
    calendarresources.cpp
    qtopiaformat.cpp
    htmlexport.cpp
    calendarnull.cpp
    freebusyurlstore.cpp
    confirmsavedialog.cpp
    icaltimezones.cpp
    kresult.cpp )
 
 kde4_add_kcfg_files(kcal_LIB_SRCS htmlexportsettings.kcfgc )
 
 kde4_add_library(kcal SHARED ${kcal_LIB_SRCS})
 
 target_link_libraries(kcal ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} kresources kabc kpimutils )
 
 set_target_properties(kcal PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS kcal 
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kcal DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 # hack to force ical[ss].h creation
 add_custom_target(ical-headers DEPENDS
         ${CMAKE_BINARY_DIR}/kcal/libical/src/libical/ical.h
         ${CMAKE_BINARY_DIR}/kcal/libical/src/libicalss/icalss.h
 )
 add_dependencies(kcal ical-headers)
 
 ########### next target ###############
 
 set(kcal_local_PART_SRCS resourcelocal_plugin.cpp )
 
 
 kde4_add_plugin(kcal_local ${kcal_local_PART_SRCS})
 
 
 target_link_libraries(kcal_local  ${KDE4_KDECORE_LIBS} kcal )
 
 install(TARGETS kcal_local  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 
 ########### next target ###############
 
 set(kcal_localdir_PART_SRCS resourcelocaldir_plugin.cpp )
 
 
 kde4_add_plugin(kcal_localdir ${kcal_localdir_PART_SRCS})
 
 
 target_link_libraries(kcal_localdir  ${KDE4_KDECORE_LIBS} kcal )
 
 install(TARGETS kcal_localdir  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 
 add_subdirectory( libical )
 add_subdirectory( tests )
 
 ########### install files ###############
 
 install( FILES local.desktop localdir.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal)
 install( FILES
 	alarm.h
 	attachment.h
 	attendee.h
 	calendar.h
 	calendarlocal.h
 	calendarnull.h
 	calendarresources.h
 	calfilter.h
 	calformat.h
 	calstorage.h
 	confirmsavedialog.h
 	customproperties.h
 	dndfactory.h
 	duration.h
 	event.h
 	exceptions.h
 	filestorage.h
 	freebusy.h
 	freebusycache.h
 	freebusyurlstore.h
 	${CMAKE_CURRENT_BINARY_DIR}/htmlexportsettings.h
 	htmlexport.h
 	icaldrag.h
 	icalformat.h
 	icaltimezones.h
 	imipscheduler.h
 	incidencebase.h
 	incidence.h
 	incidenceformatter.h
 	journal.h
 	kcal_export.h
 	kcalversion.h
 	listbase.h
 	period.h
 	person.h
 	qtopiaformat.h
 	recurrencerule.h
 	recurrence.h
 	resourcecached.h
 	resourcecachedconfig.h
 	resourcecalendar.h
 	resourcelocalconfig.h
 	resourcelocaldirconfig.h
 	resourcelocaldir.h
 	resourcelocal.h
 	scheduler.h
 	sortablelist.h
 	todo.h
 	vcaldrag.h
 	vcalformat.h
         kresult.h
 DESTINATION ${INCLUDE_INSTALL_DIR}/kcal)
 install( FILES kcal_manager.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/kresources)
diff --git a/kimap/CMakeLists.txt b/kimap/CMakeLists.txt
index 783be5de5..49c301a8b 100644
--- a/kimap/CMakeLists.txt
+++ b/kimap/CMakeLists.txt
@@ -1,26 +1,22 @@
 project(kimap)
 
 add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5327 )
 
 add_subdirectory( tests )
 
 ########### next target ###############
 
 set(kimap_LIB_SRCS
    rfccodecs.cpp)
 
 
 kde4_add_library(kimap SHARED ${kimap_LIB_SRCS})
 
 target_link_libraries(kimap ${KDE4_KDECORE_LIBS})
 
 set_target_properties(kimap PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kimap  
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kimap DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 
 install( FILES kimap_export.h rfccodecs.h DESTINATION ${INCLUDE_INSTALL_DIR}/kimap  )
diff --git a/kldap/CMakeLists.txt b/kldap/CMakeLists.txt
index b2def8996..80eb55068 100644
--- a/kldap/CMakeLists.txt
+++ b/kldap/CMakeLists.txt
@@ -1,87 +1,83 @@
 project(kldap)
 include(CheckFunctionExists)
 include(CheckSymbolExists)
 
 add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5322 )
 
 macro_optional_find_package(Ldap)
 macro_log_feature(LDAP_FOUND "OpenLDAP" "LDAP (Lightweight Directory Access Protocol) libraries" "http://www.openldap.org" FALSE "" "Needed to provide LDAP functionality in KDE" )
 
 #look for Sasl2 in the top-level CMakeLists.txt file now
 #macro_optional_find_package(Sasl2)
 #macro_log_feature(SASL2_FOUND "cyrus-sasl" "Cyrus SASL API" "http://asg.web.cmu.edu/sasl/sasl-library.html" FALSE "" "Needed to support authentication of logins" )
 
 check_include_files(sys/time.h    HAVE_SYS_TIME_H)
 
 set(kldap_EXTRA_LIBS)
 set(kldap_EXTRA_INCLUDES)
 
 if (LDAP_FOUND)
 set(kldap_EXTRA_LIBS ${LDAP_LIBRARIES})
 set(kldap_EXTRA_INCLUDES ${LDAP_INCLUDE_DIR})
 
 set(CMAKE_REQUIRED_INCLUDES lber.h ldap.h)
 set(CMAKE_REQUIRED_LIBRARIES ${LDAP_LIBRARIES})
 check_function_exists(ldap_start_tls_s HAVE_LDAP_START_TLS_S)
 check_function_exists(ldap_initialize HAVE_LDAP_INITIALIZE)
 check_function_exists(ber_memfree HAVE_BER_MEMFREE)
 check_function_exists(ldap_unbind_ext HAVE_LDAP_UNBIND_EXT)
 check_function_exists(ldap_extended_operation HAVE_LDAP_EXTENDED_OPERATION)
 check_function_exists(ldap_extended_operation_s HAVE_LDAP_EXTENDED_OPERATION_S)
 check_symbol_exists(ldap_extended_operation ldap.h HAVE_LDAP_EXTENDED_OPERATION_PROTOTYPE)
 check_symbol_exists(ldap_extended_operation_s ldap.h HAVE_LDAP_EXTENDED_OPERATION_S_PROTOTYPE)
 
 
 endif (LDAP_FOUND)
 
 if (SASL2_FOUND)
 set(kldap_EXTRA_LIBS ${kldap_EXTRA_LIBS} ${SASL2_LIBRARIES} ${KDE4_KDECORE_LIBS})
 set(kldap_EXTRA_INCLUDES ${kldap_EXTRA_INCLUDES} ${SASL2_INCLUDE_DIR})
 endif (SASL2_FOUND)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kldap_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kldap_config.h )
 
 add_subdirectory(tests)
 
 ########### next target ###############
 
 
 set(kldap_LIB_SRCS
    ber.cpp
    ldif.cpp
    ldapurl.cpp
    ldapserver.cpp
    ldapobject.cpp
    ldapconnection.cpp
    ldapoperation.cpp
    ldapcontrol.cpp
    ldapsearch.cpp
    ldapconfigwidget.cpp
    ldapdn.cpp
    ldapmodelnode_p.cpp
    ldapmodel.cpp
    ldapmodel_p.cpp
    ldapstructureproxymodel.cpp
    ldapattributeproxymodel.cpp)
 
 
 kde4_add_library(kldap SHARED ${kldap_LIB_SRCS})
 
 include_directories( ${kldap_EXTRA_INCLUDES} )
 
 target_link_libraries(kldap ${KDE4_KIO_LIBS} ${kldap_EXTRA_LIBS} )
 
 set_target_properties(kldap PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS kldap
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kldap DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 
 install( FILES ber.h kldap_export.h ldapdefs.h ldif.h ldapurl.h ldapserver.h ldapobject.h
   ldapconnection.h ldapoperation.h
   ldapconfigwidget.h ldapcontrol.h ldapsearch.h
   ldapdn.h ldapmodel.h ldapstructureproxymodel.h ldapattributeproxymodel.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/kldap)
diff --git a/kmime/CMakeLists.txt b/kmime/CMakeLists.txt
index 076153d6d..e9a038a91 100644
--- a/kmime/CMakeLists.txt
+++ b/kmime/CMakeLists.txt
@@ -1,59 +1,55 @@
 add_subdirectory( tests )
 
 include_directories(
 	${CMAKE_SOURCE_DIR}/libkdepim/
 )
 
 include(CheckTimezone)
 configure_file (config-kmime.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmime.h)
 
 ########### next target ###############
 
 set(kmime_LIB_SRCS
    kmime_charfreq.cpp
    kmime_util.cpp
    kmime_mdn.cpp
    kmime_codecs.cpp
    kmime_codec_base64.cpp
    kmime_codec_uuencode.cpp
    kmime_codec_qp.cpp
    kmime_codec_identity.cpp
    kmime_parsers.cpp
    kmime_header_parsing.cpp
    kmime_content.cpp
    kmime_contentindex.cpp
    kmime_headers.cpp
    kmime_message.cpp
    kmime_newsarticle.cpp
    kmime_dateformatter.cpp
    boolflags.cpp
    kautodeletehash.cpp )
 
 
 kde4_add_library(kmime SHARED ${kmime_LIB_SRCS})
 
 target_link_libraries(kmime  ${KDE4_KDECORE_LIBS} )
 
 set_target_properties(kmime PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS kmime  
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kmime DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 install( FILES
         boolflags.h
         kmime_export.h
         kmime_charfreq.h
         kmime_codecs.h
         kmime_content.h
         kmime_contentindex.h
         kmime_header_parsing.h
         kmime_headers.h
         kmime_message.h
         kmime_mdn.h
         kmime_newsarticle.h
         kmime_dateformatter.h
         kmime_util.h
 DESTINATION ${INCLUDE_INSTALL_DIR}/kmime)
 
diff --git a/kpimidentities/CMakeLists.txt b/kpimidentities/CMakeLists.txt
index cbdb460cb..0edbd06da 100644
--- a/kpimidentities/CMakeLists.txt
+++ b/kpimidentities/CMakeLists.txt
@@ -1,27 +1,23 @@
 ########### next target ###############
 
 set(kpimidentities_LIB_SRCS identitymanager.cpp identity.cpp signature.cpp identitycombo.cpp)
 
 
 qt4_add_dbus_adaptor(kpimidentities_LIB_SRCS org.kde.pim.IdentityManager.xml identitymanager.h KPIMIdentities::IdentityManager )
 
 kde4_add_library(kpimidentities SHARED ${kpimidentities_LIB_SRCS})
 
 target_link_libraries(kpimidentities ${QT_AND_KDECORE_LIBS}  kpimutils ${KDE4_KIO_LIBS})
 
 set_target_properties(kpimidentities PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kpimidentities  
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kpimidentities DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES org.kde.pim.IdentityManager.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
 install(FILES
         identity.h
         signature.h
         identitymanager.h
         identitycombo.h
         kpimidentities_export.h
         DESTINATION ${INCLUDE_INSTALL_DIR}/kpimidentities )
 
diff --git a/kpimutils/CMakeLists.txt b/kpimutils/CMakeLists.txt
index d5d01e060..07c2c3c51 100644
--- a/kpimutils/CMakeLists.txt
+++ b/kpimutils/CMakeLists.txt
@@ -1,29 +1,25 @@
 project(kpimutils)
 
 add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5321 )
 
 add_subdirectory( tests )
 
 ########### next target ###############
 
 set(kpimutils_LIB_SRCS
    email.cpp linklocator.cpp spellingfilter.cpp kfileio.cpp)
 
 kde4_add_kcfg_files(kpimutils_LIB_SRCS pimemoticons.kcfgc)
 
 kde4_add_library(kpimutils SHARED ${kpimutils_LIB_SRCS})
 
 target_link_libraries(kpimutils ${KDE4_KDEUI_LIBS})
 
 set_target_properties(kpimutils PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kpimutils  
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kpimutils DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 
 install( FILES kpimutils_export.h email.h linklocator.h spellingfilter.h kfileio.h DESTINATION ${INCLUDE_INSTALL_DIR}/kpimutils  )
 
 install(FILES pimemoticons.kcfg  DESTINATION ${KCFG_INSTALL_DIR})
diff --git a/kresources/CMakeLists.txt b/kresources/CMakeLists.txt
index c0f1f8cf0..c1a78cb24 100644
--- a/kresources/CMakeLists.txt
+++ b/kresources/CMakeLists.txt
@@ -1,65 +1,61 @@
 project(kresources)
 
 add_subdirectory( tests )
 
 include_directories( ${KDE4_KIO_INCLUDES} )
 
 add_definitions(${QDBUS_DEFINITIONS} -DKDE_DEFAULT_DEBUG_AREA=5650)
 
 ########### next target ###############
 
 set(kresources_LIB_SRCS
    resource.cpp
    factory.cpp
    managerimpl.cpp
    configwidget.cpp
    configdialog.cpp
    selectdialog.cpp
    configpage.cpp
    idmapper.cpp
    )
 
 qt4_add_dbus_adaptor( kresources_LIB_SRCS org.kde.KResourcesManager.xml managerimpl.h KRES::ManagerImpl )
 
 
 kde4_add_library(kresources SHARED ${kresources_LIB_SRCS})
 
 target_link_libraries(kresources  ${KDE4_KIO_LIBS} )
 
 set_target_properties(kresources PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kresources  
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kresources DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### next target ###############
 
 set(kcm_kresources_PART_SRCS kcmkresources.cpp )
 
 
 kde4_add_plugin(kcm_kresources ${kcm_kresources_PART_SRCS})
 
 target_link_libraries(kcm_kresources  ${KDE4_KDECORE_LIBS} kresources )
 
 install(TARGETS kcm_kresources  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 ########### install files ###############
 
 install( FILES kresources.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 install( FILES kresources_plugin.desktop kresources_manager.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
 install( FILES
   kresources_export.h
   resource.h
   configwidget.h
   factory.h
   managerimpl.h
   manager.h
   selectdialog.h
   configdialog.h
   configpage.h
   idmapper.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/kresources)
 install( FILES org.kde.KResourcesManager.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
 
 
diff --git a/ktnef/CMakeLists.txt b/ktnef/CMakeLists.txt
index 4487d24f5..90d966d0c 100644
--- a/ktnef/CMakeLists.txt
+++ b/ktnef/CMakeLists.txt
@@ -1,45 +1,41 @@
 project(ktnef)
 
 add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5975 )
 
 add_subdirectory( tests )
 
 ########### next target ###############
 
 include_directories(
    ${CMAKE_SOURCE_DIR}/kabc
    ${CMAKE_BINARY_DIR}/kabc
    ${CMAKE_SOURCE_DIR}/kcal
 )
 
 set(ktnef_LIB_SRCS
    ktnefparser.cpp
    ktnefproperty.cpp
    ktnefattach.cpp
    mapi.cpp
    ktnefpropertyset.cpp
    ktnefmessage.cpp
    ktnefwriter.cpp
    lzfu.cpp
    formatter.cpp
 )
 
 
 kde4_add_library(ktnef SHARED ${ktnef_LIB_SRCS})
 
 target_link_libraries(ktnef  ${KDE4_KIO_LIBS} kabc kcal)
 
 set_target_properties(ktnef PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS ktnef 
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS ktnef DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 
 install( FILES ktnef_export.h ktnefparser.h ktnefattach.h ktnefproperty.h
          ktnefpropertyset.h ktnefmessage.h ktnefwriter.h ktnefdefs.h formatter.h
          DESTINATION ${INCLUDE_INSTALL_DIR}/ktnef)
 
 
diff --git a/kxmlrpcclient/CMakeLists.txt b/kxmlrpcclient/CMakeLists.txt
index c2ea905f7..511342882 100644
--- a/kxmlrpcclient/CMakeLists.txt
+++ b/kxmlrpcclient/CMakeLists.txt
@@ -1,24 +1,20 @@
 project(kxmlrpcclient)
 add_subdirectory( tests )
 
 ########### next target ###############
 
 set(kxmlrpcclient_LIB_SRCS
    client.cpp
    query.cpp)
 
 
 kde4_add_library(kxmlrpcclient SHARED ${kxmlrpcclient_LIB_SRCS})
 
 target_link_libraries(kxmlrpcclient ${KDE4_KIO_LIBS})
 
 set_target_properties(kxmlrpcclient PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kxmlrpcclient  
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS kxmlrpcclient DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 
 install( FILES kxmlrpcclient_export.h client.h DESTINATION ${INCLUDE_INSTALL_DIR}/kxmlrpcclient  )
diff --git a/mailtransport/CMakeLists.txt b/mailtransport/CMakeLists.txt
index 36fd4f83b..7b968b84d 100644
--- a/mailtransport/CMakeLists.txt
+++ b/mailtransport/CMakeLists.txt
@@ -1,64 +1,60 @@
 
 add_subdirectory( kconf_update )
 add_subdirectory( tests )
 
 add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
 add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5324 )
 
 set(mailtransport_lib_srcs
   transport.cpp
   transportcombobox.cpp
   transportconfigdialog.cpp
   transportjob.cpp
   transportmanager.cpp
   transportmanagementwidget.cpp
   transporttypedialog.cpp
   sendmailjob.cpp
   smtpjob.cpp
   precommandjob.cpp
   legacydecrypt.cpp
   socket.cpp
   servertest.cpp
 )
 
 
 kde4_add_ui_files(mailtransport_lib_srcs
   smtpsettings.ui
   sendmailsettings.ui
   transportmanagementwidget.ui
   transporttypedialog.ui
 )
 kde4_add_kcfg_files(mailtransport_lib_srcs transportbase.kcfgc)
 
 kde4_add_library(mailtransport SHARED ${mailtransport_lib_srcs})
 target_link_libraries(mailtransport ${KDE4_KIO_LIBS})
 set_target_properties(mailtransport PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
-install(TARGETS mailtransport 
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS mailtransport DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES mailtransport.kcfg  DESTINATION ${KCFG_INSTALL_DIR})
 
 set(mailtransport_kcm_srcs configmodule.cpp)
 kde4_add_plugin(kcm_mailtransport ${mailtransport_kcm_srcs})
 target_link_libraries(kcm_mailtransport  ${KDE4_KDEUI_LIBS} mailtransport)
 
 install(TARGETS kcm_mailtransport  DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES kcm_mailtransport.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
 install( FILES 
         mailtransport_export.h
         sendmailjob.h
         smtpjob.h
         transport.h
         ${CMAKE_CURRENT_BINARY_DIR}/transportbase.h
         transportcombobox.h
         transportconfigdialog.h
         transportjob.h
         transportmanagementwidget.h
         transportmanager.h
         transporttypedialog.h
         servertest.h
           DESTINATION ${INCLUDE_INSTALL_DIR}/mailtransport )
 
diff --git a/qgpgme/CMakeLists.txt b/qgpgme/CMakeLists.txt
index c562c4c40..bdadfac00 100644
--- a/qgpgme/CMakeLists.txt
+++ b/qgpgme/CMakeLists.txt
@@ -1,57 +1,53 @@
 
 set( _any_gpgme_found false )
 
 if ( WIN32 AND GPGME_QT_FOUND )
 
    # on Windows, we require gpgme-qt
 
    set( _any_gpgme_found true )
    set( _qgpgme_libgpgme gpgmepp-qt )
    set( _qgpgme_extra_src eventloopinteractor_win.cpp )
 
 endif ( WIN32 AND GPGME_QT_FOUND )
 
 if ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
 
    # on Unix, we requrie gpgme-pthread (for convenience, since vanilla
    # gpgme isn't thread-aware, and we don't want to restrict clients
    # of qgpgme to non-threaded useage of gpgme)
 
    set( _any_gpgme_found true )
    set( _qgpgme_libgpgme gpgmepp-pthread )
    set( _qgpgme_extra_src eventloopinteractor_unix.cpp )
 
 endif ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
 
 # build / install only if any useable gpgme was found:
 
 if ( _any_gpgme_found )
 
    include_directories( ${GPGME_INCLUDES} ${CMAKE_SOURCE_DIR}/gpgme++ ${Boost_INCLUDE_DIR} )
 
    add_subdirectory( tests )
 
    set( qgpgme_LIB_SRCS
         dataprovider.cpp
         eventloopinteractor.cpp
         ${_qgpgme_extra_src}
    )
 
    kde4_add_library( qgpgme SHARED ${qgpgme_LIB_SRCS} )
 
    target_link_libraries( qgpgme ${QT_QTCORE_LIBRARY} ${_qgpgme_libgpgme} )
 
    set_target_properties( qgpgme PROPERTIES
      VERSION   1.0.0
      SOVERSION 1.0.0
    )
 
-   install( TARGETS qgpgme  
-     RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-     LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-   )
+   install( TARGETS qgpgme DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
    install( FILES qgpgme_export.h eventloopinteractor.h dataprovider.h DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme )
 
 endif ( _any_gpgme_found )
diff --git a/syndication/CMakeLists.txt b/syndication/CMakeLists.txt
index 5630305e1..b6c9fae71 100644
--- a/syndication/CMakeLists.txt
+++ b/syndication/CMakeLists.txt
@@ -1,137 +1,133 @@
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 
 add_subdirectory( tests ) 
 
 add_subdirectory( atom )
 add_subdirectory( rdf ) 
 add_subdirectory( rss2 ) 
 
 include_directories( ${Boost_INCLUDE_DIR} )
 
 ########### next target ###############
 
 set(librss2local_SRCS 
 	./rss2/category.cpp 
 	./rss2/cloud.cpp 
 	./rss2/document.cpp 
 	./rss2/enclosure.cpp 
 	./rss2/image.cpp
 	./rss2/item.cpp 
 	./rss2/parser.cpp 
 	./rss2/source.cpp 
 	./rss2/textinput.cpp
 	./rss2/tools_p.cpp
 	)
 
 
 set(librdflocal_la_SRCS
 	./rdf/parser.cpp 
 	./rdf/dublincorevocab.cpp 
 	./rdf/dublincore.cpp 
 	./rdf/syndicationvocab.cpp 
 	./rdf/syndicationinfo.cpp 
 	./rdf/contentvocab.cpp 
 	./rdf/item.cpp 
 	./rdf/image.cpp 
 	./rdf/textinput.cpp 
 	./rdf/document.cpp 
 	./rdf/rssvocab.cpp 
 	./rdf/node.cpp 
 	./rdf/property.cpp 
 	./rdf/literal.cpp 
 	./rdf/resource.cpp 
 	./rdf/model.cpp 
 	./rdf/modelmaker.cpp 
 	./rdf/rdfvocab.cpp 
 	./rdf/sequence.cpp 
 	./rdf/statement.cpp 
 	./rdf/resourcewrapper.cpp 
 	./rdf/nodevisitor.cpp
 )
 
 set(libatomlocal_SRCS 
 	./atom/category.cpp 
 	./atom/constants.cpp 
 	./atom/content.cpp 
 	./atom/document.cpp 
 	./atom/entry.cpp 
 	./atom/generator.cpp 
 	./atom/link.cpp 
 	./atom/parser.cpp 
 	./atom/person.cpp 
 	./atom/source.cpp 
 	./atom/atomtools.cpp 
 )
 
 
 set(libmapperrss2local_SRCS 
 	./mapper/feedrss2impl.cpp 
 	./mapper/itemrss2impl.cpp 
 	./mapper/enclosurerss2impl.cpp 
 	./mapper/categoryrss2impl.cpp 
 	./mapper/imagerss2impl.cpp
 )
 
 set(libmapperrdflocal_SRCS 
 	./mapper/feedrdfimpl.cpp 
 	./mapper/itemrdfimpl.cpp 
 	./mapper/imagerdfimpl.cpp
 )
 
 set(libmapperatomlocal_SRCS
 	./mapper/feedatomimpl.cpp 
 	./mapper/itematomimpl.cpp 
 	./mapper/enclosureatomimpl.cpp 
 	./mapper/categoryatomimpl.cpp
 )
 
 set(syndication_LIB_SRCS 
 	${librss2local_SRCS} 
 	${librdflocal_la_SRCS} 
 	${libatomlocal_SRCS} 
 	${libmappercommonlocal_SRCS} 
 	${libmapperrss2local_SRCS} 
 	${libmapperrdflocal_SRCS} 
 	${libmapperatomlocal_SRCS}
    documentsource.cpp 
    documentvisitor.cpp 
    elementwrapper.cpp 
    constants.cpp 
    feed.cpp 
    item.cpp 
    enclosure.cpp 
    category.cpp 
    image.cpp 
    tools.cpp 
    person.cpp
    personimpl.cpp 
    loader.cpp 
    global.cpp
    dataretriever.cpp 
    specificitemvisitor.cpp
    specificitem.cpp 
    specificdocument.cpp 
    abstractparser.cpp)
 
 
 kde4_add_library(syndication SHARED ${syndication_LIB_SRCS})
 
 target_link_libraries(syndication  ${KDE4_KIO_LIBS}  )
 
 set_target_properties(syndication PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS syndication       
-    RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
+install(TARGETS syndication DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 
 install( FILES ksyndication_export.h syndication.h specificdocument.h abstractparser.h
                parsercollection.h documentvisitor.h documentsource.h
                elementwrapper.h item.h feed.h category.h image.h         
                enclosure.h person.h global.h dataretriever.h loader.h 
                constants.h mapper.h specificitem.h
                specificitemvisitor.h tools.h
          DESTINATION ${INCLUDE_INSTALL_DIR}/syndication )