generic: adjust to kdelibs changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddb28a1..06730d7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,7 @@ project(kde-extraapps)
 include(GenerateExportHeader)
 include(FeatureSummary)
 
-find_package(KDE4 4.23.0 REQUIRED)
-include(KDE4Defaults)
+find_package(KDELibs4 4.23.0 REQUIRED)
 
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 

diff --git a/about-distro/CMakeLists.txt b/about-distro/CMakeLists.txt
index 73bf50c..02b1212 100644 (file)
--- a/about-distro/CMakeLists.txt
+++ b/about-distro/CMakeLists.txt
@@ -3,8 +3,8 @@ project(kcm-about-distro)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()

diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt
index 0ad7ad6..da42a9c 100644 (file)
--- a/ark/CMakeLists.txt
+++ b/ark/CMakeLists.txt
@@ -4,8 +4,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(GenerateExportHeader)
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()

diff --git a/ark/app/CMakeLists.txt b/ark/app/CMakeLists.txt
index b1cdeb1..4ac4aa5 100644 (file)
--- a/ark/app/CMakeLists.txt
+++ b/ark/app/CMakeLists.txt
@@ -29,7 +29,10 @@ configure_file(
     ${CMAKE_CURRENT_BINARY_DIR}/ark_servicemenu.desktop
 )
 
-install(TARGETS ark ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS ark
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
 
 install(
     FILES ark_addtoservicemenu.desktop ${CMAKE_CURRENT_BINARY_DIR}/ark_servicemenu.desktop

diff --git a/ark/kerfuffle/CMakeLists.txt b/ark/kerfuffle/CMakeLists.txt
index 7f1d0bc..d5eea2c 100644 (file)
--- a/ark/kerfuffle/CMakeLists.txt
+++ b/ark/kerfuffle/CMakeLists.txt
@@ -15,7 +15,6 @@ set(kerfuffle_SRCS
 kde4_add_kcfg_files(kerfuffle_SRCS settings.kcfgc)
 
 add_library(kerfuffle SHARED ${kerfuffle_SRCS})
-
 target_link_libraries(kerfuffle
     ${KDE4_KFILE_LIBS}
     ${KDE4_KPARTS_LIBS}
@@ -29,7 +28,10 @@ set_target_properties(kerfuffle PROPERTIES
 
 generate_export_header(kerfuffle)
 
-install(TARGETS kerfuffle ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS kerfuffle
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}
+)
 
 install(
     FILES kerfufflePlugin.desktop

diff --git a/filelight/CMakeLists.txt b/filelight/CMakeLists.txt
index 866586c..49c143a 100644 (file)
--- a/filelight/CMakeLists.txt
+++ b/filelight/CMakeLists.txt
@@ -23,8 +23,8 @@ project(Filelight)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()

diff --git a/filelight/src/app/CMakeLists.txt b/filelight/src/app/CMakeLists.txt
index 47d63fe..c23ebdd 100644 (file)
--- a/filelight/src/app/CMakeLists.txt
+++ b/filelight/src/app/CMakeLists.txt
@@ -22,6 +22,13 @@ set(filelight_SRCS historyAction.cpp mainWindow.cpp main.cpp)
 
 add_executable(filelight ${filelight_SRCS})
 
-target_link_libraries(filelight ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(filelight
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KPARTS_LIBS}
+    ${KDE4_KDEUI_LIBS}
+)
 
-install(TARGETS filelight ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS filelight
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)

diff --git a/gwenview/CMakeLists.txt b/gwenview/CMakeLists.txt
index 59acc34..c91ec0d 100644 (file)
--- a/gwenview/CMakeLists.txt
+++ b/gwenview/CMakeLists.txt
@@ -4,8 +4,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(GenerateExportHeader)
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()

diff --git a/gwenview/app/CMakeLists.txt b/gwenview/app/CMakeLists.txt
index 3dee21c..49a4fd2 100644 (file)
--- a/gwenview/app/CMakeLists.txt
+++ b/gwenview/app/CMakeLists.txt
@@ -45,7 +45,7 @@ target_link_libraries(gwenview
     gwenviewlib
 )
 
-install(TARGETS gwenview ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS gwenview DESTINATION ${KDE4_BIN_INSTALL_DIR})
 
 install(FILES gwenviewui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/gwenview)
 

diff --git a/gwenview/importer/CMakeLists.txt b/gwenview/importer/CMakeLists.txt
index afa2775..235696f 100644 (file)
--- a/gwenview/importer/CMakeLists.txt
+++ b/gwenview/importer/CMakeLists.txt
@@ -26,23 +26,19 @@ set(importer_SRCS
 kde4_add_kcfg_files(importer_SRCS importerconfig.kcfgc)
 
 add_executable(gwenview_importer ${importer_SRCS})
-
-target_link_libraries(gwenview_importer PRIVATE
+target_link_libraries(gwenview_importer
     ${KDE4_KFILE_LIBS}
-    gwenviewlib
     ${KDE4_KIO_LIBS}
     ${KDE4_SOLID_LIBS}
     ${QT_QTCORE_LIBRARY}
+    gwenviewlib
 )
 
-target_link_libraries(gwenview_importer PUBLIC
-    ${KDE4_KIO_LIBS}
-    ${KDE4_SOLID_LIBS}
-    ${QT_QTCORE_LIBRARY}
+install(
+    TARGETS gwenview_importer
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
 )
 
-install(TARGETS gwenview_importer ${INSTALL_TARGETS_DEFAULT_ARGS})
-
 install(FILES gwenview_importer.desktop
     gwenview_importer_camera.desktop
     DESTINATION ${KDE4_DATA_INSTALL_DIR}/solid/actions/)

diff --git a/gwenview/lib/CMakeLists.txt b/gwenview/lib/CMakeLists.txt
index 91084c9..a480fc3 100644 (file)
--- a/gwenview/lib/CMakeLists.txt
+++ b/gwenview/lib/CMakeLists.txt
@@ -102,6 +102,7 @@ set_source_files_properties(
 )
 
 add_library(gwenviewlib SHARED ${gwenviewlib_SRCS})
+
 set_target_properties(gwenviewlib PROPERTIES
     VERSION ${GENERIC_LIB_VERSION}
     SOVERSION ${GENERIC_LIB_SOVERSION}
@@ -118,4 +119,7 @@ target_link_libraries(gwenviewlib
     ${CMAKE_THREAD_LIBS_INIT}
 )
 
-install(TARGETS gwenviewlib ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS gwenviewlib
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}
+)

diff --git a/kcalc/CMakeLists.txt b/kcalc/CMakeLists.txt
index 1bc19e5..a5818aa 100644 (file)
--- a/kcalc/CMakeLists.txt
+++ b/kcalc/CMakeLists.txt
@@ -3,8 +3,8 @@ project(kcalc)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
@@ -77,7 +77,10 @@ target_link_libraries(kcalc
     ${GMP_LIBRARIES}
 )
 
-install(TARGETS kcalc ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS kcalc
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
 
 ########### install files ###############
 

diff --git a/kcolorchooser/CMakeLists.txt b/kcolorchooser/CMakeLists.txt
index db01eaa..026d125 100644 (file)
--- a/kcolorchooser/CMakeLists.txt
+++ b/kcolorchooser/CMakeLists.txt
@@ -3,22 +3,32 @@ project(kcolorchooser)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
 
-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+include_directories(
+    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}
+    ${KDE4_INCLUDES}
+)
 
-set(kcolorchooser_SRCS kcolorchooser.cpp )
+set(kcolorchooser_SRCS kcolorchooser.cpp)
 
 add_executable(kcolorchooser ${kcolorchooser_SRCS})
 
 target_link_libraries(kcolorchooser ${KDE4_KDEUI_LIBS})
 
-install(TARGETS kcolorchooser  ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(PROGRAMS kcolorchooser.desktop  DESTINATION  ${KDE4_XDG_APPS_INSTALL_DIR})
+install(
+    TARGETS kcolorchooser
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
+install(
+    PROGRAMS kcolorchooser.desktop
+    DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
+)
 
 kde4_install_icons(${KDE4_ICON_INSTALL_DIR})
 

diff --git a/kdeplasma-addons/CMakeLists.txt b/kdeplasma-addons/CMakeLists.txt
index 99f5a8e..1243b46 100644 (file)
--- a/kdeplasma-addons/CMakeLists.txt
+++ b/kdeplasma-addons/CMakeLists.txt
@@ -4,8 +4,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(GenerateExportHeader)
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()

diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt b/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt
index 71600e5..8a86388 100644 (file)
--- a/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt
@@ -28,5 +28,12 @@ target_link_libraries(plasma_groupingcontainment ${KDE4_PLASMA_LIBS})
 
 generate_export_header(plasma_groupingcontainment)
 
-set_target_properties(plasma_groupingcontainment PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
-install(TARGETS plasma_groupingcontainment EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+set_target_properties(plasma_groupingcontainment PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
+
+install(
+    TARGETS plasma_groupingcontainment
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}
+)

diff --git a/kdeplasma-addons/dataengines/potd/CMakeLists.txt b/kdeplasma-addons/dataengines/potd/CMakeLists.txt
index 7339dac..e99c5de 100644 (file)
--- a/kdeplasma-addons/dataengines/potd/CMakeLists.txt
+++ b/kdeplasma-addons/dataengines/potd/CMakeLists.txt
@@ -21,14 +21,14 @@ target_link_libraries(plasmapotdprovidercore ${KDE4_KDEUI_LIBS})
 
 generate_export_header(plasmapotdprovidercore BASE_NAME plasma_potd)
 
-install( TARGETS plasmapotdprovidercore ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install( TARGETS plasmapotdprovidercore DESTINATION ${KDE4_LIB_INSTALL_DIR})
 install( FILES plasma_potdprovider.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR} )
 
 
 ########### plugins ###############
 
 set( potd_flickr_provider_SRCS
-       flickrprovider.cpp
+    flickrprovider.cpp
 )
 
 kde4_add_plugin( plasma_potd_flickrprovider ${potd_flickr_provider_SRCS} )
@@ -38,7 +38,7 @@ install( FILES flickrprovider.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )
 
 
 set( potd_apod_provider_SRCS
-       apodprovider.cpp
+    apodprovider.cpp
 )
 
 kde4_add_plugin( plasma_potd_apodprovider ${potd_apod_provider_SRCS} )
@@ -47,7 +47,7 @@ install( TARGETS plasma_potd_apodprovider DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
 install( FILES apodprovider.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )
 
 set( potd_epod_provider_SRCS
-       epodprovider.cpp
+    epodprovider.cpp
 )
 
 kde4_add_plugin( plasma_potd_epodprovider ${potd_epod_provider_SRCS} )

diff --git a/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt b/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt
index 7f75fd5..80061eb 100644 (file)
--- a/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt
+++ b/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt
@@ -16,7 +16,6 @@ set(plasmaweather_HEADERS
 )
 
 add_library(plasmaweather SHARED ${plasmaweather_LIB_SRCS})
-
 target_link_libraries(plasmaweather
     ${KDE4_PLASMA_LIBS}
     ${KDE4_KDEUI_LIBS}
@@ -30,6 +29,9 @@ set_target_properties(plasmaweather PROPERTIES
 
 generate_export_header(plasmaweather)
 
-install(TARGETS plasmaweather ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS plasmaweather
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}
+)
 # nothing outside of kdeplasma-addons uses this library, and the API is not stable -> do not install headers!
-#install(FILES ${plasmaweather_HEADERS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasmaweather COMPONENT Devel)
+# install(FILES ${plasmaweather_HEADERS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasmaweather)

diff --git a/kemu/CMakeLists.txt b/kemu/CMakeLists.txt
index 44e5dbb..fd9aecc 100644 (file)
--- a/kemu/CMakeLists.txt
+++ b/kemu/CMakeLists.txt
@@ -3,8 +3,8 @@ project(kemu)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()

diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt
index a370b19..6950460 100644 (file)
--- a/kget/CMakeLists.txt
+++ b/kget/CMakeLists.txt
@@ -3,8 +3,8 @@ project(kget)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
@@ -141,7 +141,10 @@ set_target_properties(kgetcore PROPERTIES
     SOVERSION ${GENERIC_LIB_SOVERSION}
 )
 
-install(TARGETS kgetcore ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS kgetcore
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}
+)
 
 # kget
 
@@ -226,9 +229,15 @@ if (KGET_TESTING)
     )
 endif()
 
-install(TARGETS kget ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS kget
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
 
-install(FILES kget.notifyrc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kget)
+install(
+    FILES kget.notifyrc
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/kget
+)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
index 0cffff2..51df89c 100644 (file)
--- a/kmix/CMakeLists.txt
+++ b/kmix/CMakeLists.txt
@@ -3,8 +3,8 @@ project(kmix)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
@@ -124,8 +124,7 @@ endif()
 
 install(
     TARGETS kmix
-    DESTINATION ${KDE4_LIB_INSTALL_DIR}
-    ${INSTALL_TARGETS_DEFAULT_ARGS}
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
 )
 
 ########### next target ###############
@@ -212,8 +211,7 @@ add_subdirectory( plasma )
 
 install(
     TARGETS kmixctrl
-    DESTINATION ${KDE4_LIB_INSTALL_DIR}
-    ${INSTALL_TARGETS_DEFAULT_ARGS}
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
 )
 
 install(PROGRAMS kmix.desktop DESTINATION  ${KDE4_XDG_APPS_INSTALL_DIR})

diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt
index 8207018..0080ae9 100644 (file)
--- a/krdc/CMakeLists.txt
+++ b/krdc/CMakeLists.txt
@@ -4,8 +4,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(GenerateExportHeader)
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
@@ -69,7 +69,7 @@ target_link_libraries(krdc
 
 target_link_libraries(krdc ${KDE4_KDNSSD_LIBS})
 
-install(TARGETS krdc ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS krdc DESTINATION ${KDE4_BIN_INSTALL_DIR})
 install(FILES krdcui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/krdc)
 install(PROGRAMS krdc.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR})
 install(FILES pointcursor.png pointcursormask.png DESTINATION ${KDE4_DATA_INSTALL_DIR}/krdc/pics)

diff --git a/krdc/core/CMakeLists.txt b/krdc/core/CMakeLists.txt
index d59517d..3d51437 100644 (file)
--- a/krdc/core/CMakeLists.txt
+++ b/krdc/core/CMakeLists.txt
@@ -23,7 +23,10 @@ set_target_properties(krdccore PROPERTIES
 
 generate_export_header(krdccore)
 
-install(TARGETS krdccore ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS krdccore
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}
+)
 
 # Install headers
 set(krdccore_HDRS
@@ -32,6 +35,15 @@ set(krdccore_HDRS
     hostpreferences.h
 )
 
-install(FILES ${krdccore_HDRS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/krdc COMPONENT Devel)
-install(FILES krdc_plugin.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR})
-install(FILES krdc.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR})
+install(
+    FILES ${krdccore_HDRS}
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/krdc
+)
+install(
+    FILES krdc_plugin.desktop
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
+)
+install(
+    FILES krdc.kcfg
+    DESTINATION ${KDE4_KCFG_INSTALL_DIR}
+)

diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt
index 0bc92ff..09f09a3 100644 (file)
--- a/krfb/CMakeLists.txt
+++ b/krfb/CMakeLists.txt
@@ -3,8 +3,8 @@ project(krfb)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()

diff --git a/krfb/krfb/CMakeLists.txt b/krfb/krfb/CMakeLists.txt
index a2bc215..2e6ffa0 100644 (file)
--- a/krfb/krfb/CMakeLists.txt
+++ b/krfb/krfb/CMakeLists.txt
@@ -13,7 +13,6 @@ set(krfbprivate_SRCS
 )
 
 add_library(krfbprivate SHARED ${krfbprivate_SRCS})
-
 target_link_libraries(krfbprivate
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
@@ -28,7 +27,7 @@ set_target_properties(krfbprivate PROPERTIES
 
 install(
     TARGETS krfbprivate
-    ${INSTALL_TARGETS_DEFAULT_ARGS}
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}
     LIBRARY NAMELINK_SKIP
 )
 
@@ -84,7 +83,8 @@ target_link_libraries(krfb
 )
 
 install(
-    TARGETS krfb ${INSTALL_TARGETS_DEFAULT_ARGS}
+    TARGETS krfb
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
 )
 
 ########### install files ###############

diff --git a/ksnapshot/CMakeLists.txt b/ksnapshot/CMakeLists.txt
index 41a4761..7e8a49b 100644 (file)
--- a/ksnapshot/CMakeLists.txt
+++ b/ksnapshot/CMakeLists.txt
@@ -3,8 +3,8 @@ project(ksnapshot)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
@@ -59,7 +59,10 @@ if (X11_Xfixes_FOUND)
     target_link_libraries(ksnapshot ${X11_Xfixes_LIB})
 endif (X11_Xfixes_FOUND)
 
-install(TARGETS ksnapshot ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS ksnapshot
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
 
 ########### next target ###############
 
@@ -69,15 +72,26 @@ set(kbackgroundsnapshot_SRCS
 )
 
 add_executable(kbackgroundsnapshot ${kbackgroundsnapshot_SRCS})
+target_link_libraries(kbackgroundsnapshot
+    ${KDE4_KIO_LIBS}
+    ${X11_LIBRARIES}
+)
 
-target_link_libraries(kbackgroundsnapshot ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
-
-install(TARGETS kbackgroundsnapshot ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS kbackgroundsnapshot
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
 
 ########### install files ###############
 
-install(PROGRAMS ksnapshot.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR})
-install(FILES org.kde.ksnapshot.xml DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR} )
+install(
+    PROGRAMS ksnapshot.desktop
+    DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
+)
+install(
+    FILES org.kde.ksnapshot.xml
+    DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
+)
 kde4_install_icons(${KDE4_ICON_INSTALL_DIR} )
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/ktimer/CMakeLists.txt b/ktimer/CMakeLists.txt
index c54fcf9..961acdc 100644 (file)
--- a/ktimer/CMakeLists.txt
+++ b/ktimer/CMakeLists.txt
@@ -3,23 +3,28 @@ project(ktimer)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
 
-set(ktimer_SRCS main.cpp ktimer.cpp prefwidget.ui )
+set(ktimer_SRCS main.cpp ktimer.cpp prefwidget.ui)
 
 add_executable(ktimer ${ktimer_SRCS})
-
 target_link_libraries(ktimer  ${KDE4_KIO_LIBS})
 
-install(TARGETS ktimer  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(
+    TARGETS ktimer
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
 
 ########### install files ###############
 
-install(PROGRAMS ktimer.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR})
+install(
+    PROGRAMS ktimer.desktop
+    DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
+)
 
 kde4_install_icons(${KDE4_ICON_INSTALL_DIR})
 

diff --git a/kvkbd/CMakeLists.txt b/kvkbd/CMakeLists.txt
index 0875634..46b1d49 100644 (file)
--- a/kvkbd/CMakeLists.txt
+++ b/kvkbd/CMakeLists.txt
@@ -3,8 +3,8 @@ project( kvkbd )
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()

diff --git a/kvkbd/src/CMakeLists.txt b/kvkbd/src/CMakeLists.txt
index 7e220f5..7ac215f 100644 (file)
--- a/kvkbd/src/CMakeLists.txt
+++ b/kvkbd/src/CMakeLists.txt
@@ -31,6 +31,12 @@ target_link_libraries(kvkbd
     ${X11_XTest_LIB}
 )
 
-install(TARGETS kvkbd ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS kvkbd
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
 
-install(FILES kvkbd.desktop  DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR})
+install(
+    FILES kvkbd.desktop
+    DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
+)

diff --git a/okular/CMakeLists.txt b/okular/CMakeLists.txt
index 2e0297f..c465059 100644 (file)
--- a/okular/CMakeLists.txt
+++ b/okular/CMakeLists.txt
@@ -4,8 +4,8 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(GenerateExportHeader)
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
@@ -129,7 +129,6 @@ install(
     ${CMAKE_CURRENT_BINARY_DIR}/settings_core.h
     ${CMAKE_CURRENT_BINARY_DIR}/okular_export.h
     DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/okular/core
-    COMPONENT Devel
 )
 
 install(
@@ -140,13 +139,11 @@ install(
     interfaces/saveinterface.h
     interfaces/viewerinterface.h
     DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/okular/interfaces
-    COMPONENT Devel
 )
 
 kde4_add_kcfg_files(okularcore_SRCS ${PROJECT_SOURCE_DIR}/conf/settings_core.kcfgc )
 
 add_library(okularcore SHARED ${okularcore_SRCS})
-
 target_link_libraries(okularcore
     ${KDE4_KIO_LIBS}
     ${KDE4_KARCHIVE_LIBS}
@@ -161,11 +158,23 @@ set_target_properties(okularcore PROPERTIES
 
 generate_export_header(okularcore BASE_NAME okular)
 
-install(TARGETS okularcore ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(
+    TARGETS okularcore
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}
+)
 
-install(FILES conf/okular.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR})
-install(FILES conf/okular_core.kcfg DESTINATION ${KDE4_KCFG_INSTALL_DIR})
-install(FILES core/okularGenerator.desktop DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR})
+install(
+    FILES conf/okular.kcfg
+    DESTINATION ${KDE4_KCFG_INSTALL_DIR}
+)
+install(
+    FILES conf/okular_core.kcfg
+    DESTINATION ${KDE4_KCFG_INSTALL_DIR}
+)
+install(
+    FILES core/okularGenerator.desktop
+    DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
+)
 
 # okularpart
 
@@ -240,13 +249,21 @@ target_link_libraries(okularpart
 
 generate_export_header(okularpart)
 
-install(TARGETS okularpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
-
+install(
+    TARGETS okularpart
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
+)
 
 ########### install files ###############
 
-install(FILES okular_part.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
-install(FILES part.rc part-viewermode.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular)
+install(
+    FILES okular_part.desktop
+    DESTINATION ${KDE4_SERVICES_INSTALL_DIR}
+)
+install(
+    FILES part.rc part-viewermode.rc
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular
+)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

diff --git a/okular/shell/CMakeLists.txt b/okular/shell/CMakeLists.txt
index c95083e..f2942b4 100644 (file)
--- a/okular/shell/CMakeLists.txt
+++ b/okular/shell/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
 )
 
 # okular
-
 set(okular_SRCS
    main.cpp
    okular_main.cpp
@@ -13,14 +12,19 @@ set(okular_SRCS
 )
 
 add_executable(okular ${okular_SRCS})
-
 target_link_libraries(okular ${KDE4_KPARTS_LIBS})
 
-install(TARGETS okular ${INSTALL_TARGETS_DEFAULT_ARGS})
-
+install(
+    TARGETS okular
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
 
 # okular shell data files
-
-install( PROGRAMS okular.desktop  DESTINATION  ${KDE4_XDG_APPS_INSTALL_DIR} )
-install( FILES shell.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular )
-
+install(
+    PROGRAMS okular.desktop
+    DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
+)
+install(
+    FILES shell.rc
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/okular
+)

diff --git a/partitionmanager/CMakeLists.txt b/partitionmanager/CMakeLists.txt
index a66bbb7..41d89f1 100644 (file)
--- a/partitionmanager/CMakeLists.txt
+++ b/partitionmanager/CMakeLists.txt
@@ -20,8 +20,8 @@ project(partitionmanager)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()

diff --git a/partitionmanager/src/CMakeLists.txt b/partitionmanager/src/CMakeLists.txt
index fdf617a..9e4496a 100644 (file)
--- a/partitionmanager/src/CMakeLists.txt
+++ b/partitionmanager/src/CMakeLists.txt
@@ -184,7 +184,6 @@ qt4_wrap_ui(partitionmanagerprivate_SRCS
 kde4_add_kcfg_files(partitionmanagerprivate_SRCS config.kcfgc)
 
 add_library(partitionmanagerprivate SHARED ${partitionmanagerprivate_SRCS})
-
 target_link_libraries(partitionmanagerprivate
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KFILE_LIBS}
@@ -201,17 +200,32 @@ if(LIBATASMART_FOUND)
     )
 endif()
 
-install(TARGETS partitionmanagerprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    TARGETS partitionmanagerprivate
+    DESTINATION ${KDE4_LIB_INSTALL_DIR}
+)
 
 ############################################
 
 add_executable(partitionmanager main.cpp)
+target_link_libraries(partitionmanager
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    partitionmanagerprivate
+)
 
-target_link_libraries(partitionmanager partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS})
-
-install(TARGETS partitionmanager ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES gui/partitionmanagerui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/partitionmanager)
-install(PROGRAMS partitionmanager.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR})
+install(
+    TARGETS partitionmanager
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
+install(
+    FILES gui/partitionmanagerui.rc
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/partitionmanager
+)
+install(
+    PROGRAMS partitionmanager.desktop
+    DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
+)
 
 ############################################
 

diff --git a/thumbnailers/CMakeLists.txt b/thumbnailers/CMakeLists.txt
index 13af20e..2cd77fe 100644 (file)
--- a/thumbnailers/CMakeLists.txt
+++ b/thumbnailers/CMakeLists.txt
@@ -3,8 +3,8 @@ project(kdegraphics-thumbnailers)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()