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

List:       kde-commits
Subject:    [kolor-manager] /: set more canonical "kcm" prefixed lib and desktop names
From:       Kai-Uwe Behrmann <ku.b () gmx ! de>
Date:       2016-10-18 13:27:25
Message-ID: E1bwUQP-0005EC-GT () code ! kde ! org
[Download RAW message or body]

Git commit 1381c36617a89d3ae4bdb3ac828290e6c7dace71 by Kai-Uwe Behrmann.
Committed on 18/10/2016 at 13:23.
Pushed by behrmann into branch 'master'.

set more canonical "kcm" prefixed lib and desktop names

M  +1    -2    CMakeLists.txt
M  +7    -7    devices/CMakeLists.txt
R  +0    -0    devices/kcm_kmdevices.desktop [from: devices/kmdevices.deskt=
op - 100% similarity]
M  +8    -8    information/CMakeLists.txt
R  +0    -0    information/kcm_kminfo.desktop [from: information/kminfo.des=
ktop - 100% similarity]
M  +9    -6    settings/CMakeLists.txt
R  +0    -0    settings/kcm_kmsettings.desktop [from: settings/kmsettings.d=
esktop - 100% similarity]

http://commits.kde.org/kolor-manager/1381c36617a89d3ae4bdb3ac828290e6c7dace=
71

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70c9fa2..96d982c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,9 +30,8 @@ FIND_PACKAGE(Oyranos REQUIRED)
 FIND_PACKAGE(Synnefo REQUIRED)
  =

 =

-INCLUDE_DIRECTORIES(${KDE4_INCLUDES} ${OYRANOS_INCLUDE_DIRS} ${XCM_INCLUDE=
_DIRS} ${SYNNEFO_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${OYRANOS_INCLUDE_DIRS} ${XCM_INCLUDE_DIRS} ${SYNNEFO_=
INCLUDE_DIR})
 LINK_DIRECTORIES(
-    ${KDE4_LIBRARY_DIRS}
     ${OYRANOS_LIBRARY_DIRS}
     ${XCM_LIBRARY_DIRS}
 )
diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt
index 38c6ec9..c1d3158 100644
--- a/devices/CMakeLists.txt
+++ b/devices/CMakeLists.txt
@@ -1,15 +1,15 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 =

-SET(kmdevices_PART_SRCS =

-      kmdevices.cpp   =

+SET(kmdevices_PART_SRCS
+      kmdevices.cpp
       )
 SET(kmdevices_RCCS
       icons.qrc
       )
 =

-QT5_ADD_RESOURCES(kmdevices_RCC_SRCS ${kmdevices_RCCS})
-ADD_LIBRARY( kmdevices MODULE ${kmdevices_PART_SRCS} ${kmdevices_RCC_SRCS})
-TARGET_LINK_LIBRARIES( kmdevices =

+QT5_ADD_RESOURCES(kcm_kmdevices_RCC_SRCS ${kmdevices_RCCS})
+ADD_LIBRARY( kcm_kmdevices MODULE ${kmdevices_PART_SRCS} ${kmdevices_RCC_S=
RCS})
+TARGET_LINK_LIBRARIES( kcm_kmdevices
                        KF5::CoreAddons
                        KF5::ConfigWidgets
                        KF5::I18n
@@ -17,6 +17,6 @@ TARGET_LINK_LIBRARIES( kmdevices
                        Qt5::Core
                        Qt5::Widgets )
 =

-INSTALL( TARGETS kmdevices DESTINATION ${PLUGIN_INSTALL_DIR})
-INSTALL( FILES kmdevices.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+INSTALL( TARGETS kcm_kmdevices          DESTINATION  ${PLUGIN_INSTALL_DIR})
+INSTALL( FILES   kcm_kmdevices.desktop  DESTINATION  ${SERVICES_INSTALL_DI=
R} )
 =

diff --git a/devices/kmdevices.desktop b/devices/kcm_kmdevices.desktop
similarity index 100%
rename from devices/kmdevices.desktop
rename to devices/kcm_kmdevices.desktop
diff --git a/information/CMakeLists.txt b/information/CMakeLists.txt
index 054e713..837ef6b 100644
--- a/information/CMakeLists.txt
+++ b/information/CMakeLists.txt
@@ -1,13 +1,13 @@
-set(kminfo_PART_SRCS =

-      kminfo.cpp    =

+set(kminfo_PART_SRCS
+      kminfo.cpp
       )
-set(kmdevices_RCCS
+SET(kminfo_RCCS
       icons.qrc
       )
 =

-ADD_LIBRARY( kminfo MODULE ${kminfo_PART_SRCS} ${kminfo_RCC_SRCS} )
-SET_TARGET_PROPERTIES( kminfo PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PR=
EFIX}" )
-TARGET_LINK_LIBRARIES( kminfo
+QT5_ADD_RESOURCES(kcm_kminfo_RCC_SRCS ${kminfo_RCCS})
+ADD_LIBRARY( kcm_kminfo MODULE ${kminfo_PART_SRCS} ${kminfo_RCC_SRCS} )
+TARGET_LINK_LIBRARIES( kcm_kminfo
                        KF5::CoreAddons
                        KF5::ConfigWidgets
                        KF5::I18n
@@ -17,6 +17,6 @@ TARGET_LINK_LIBRARIES( kminfo
                      )
 =

 =

-INSTALL( TARGETS kminfo DESTINATION ${PLUGIN_INSTALL_DIR} )
-INSTALL( FILES kminfo.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+INSTALL( TARGETS kcm_kminfo          DESTINATION  ${PLUGIN_INSTALL_DIR} )
+INSTALL( FILES   kcm_kminfo.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 =

diff --git a/information/kminfo.desktop b/information/kcm_kminfo.desktop
similarity index 100%
rename from information/kminfo.desktop
rename to information/kcm_kminfo.desktop
diff --git a/settings/CMakeLists.txt b/settings/CMakeLists.txt
index 3355282..6f05a41 100644
--- a/settings/CMakeLists.txt
+++ b/settings/CMakeLists.txt
@@ -1,12 +1,15 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
  =

-SET(kmsettings_PART_SRCS =

+SET(kmsettings_PART_SRCS
       kmsettings.cpp
       )
+SET(kmsettings_RCCS
+      icons.qrc
+      )
 =

-ADD_LIBRARY( kmsettings MODULE ${kmsettings_PART_SRCS} )
-SET_TARGET_PROPERTIES( kminfo PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PR=
EFIX}" )
-TARGET_LINK_LIBRARIES( kmsettings
+QT5_ADD_RESOURCES(kcm_kmsettings_RCC_SRCS ${kmsettings_RCCS})
+ADD_LIBRARY( kcm_kmsettings MODULE ${kmsettings_PART_SRCS} )
+TARGET_LINK_LIBRARIES( kcm_kmsettings
                        KF5::CoreAddons
                        KF5::ConfigWidgets
                        KF5::I18n
@@ -15,6 +18,6 @@ TARGET_LINK_LIBRARIES( kmsettings
                        Qt5::Widgets
                      )
 =

-INSTALL(TARGETS kmsettings DESTINATION ${PLUGIN_INSTALL_DIR})
-INSTALL( FILES kmsettings.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+INSTALL(TARGETS kcm_kmsettings          DESTINATION ${PLUGIN_INSTALL_DIR})
+INSTALL(FILES   kcm_kmsettings.desktop  DESTINATION ${SERVICES_INSTALL_DIR=
} )
 =

diff --git a/settings/kmsettings.desktop b/settings/kcm_kmsettings.desktop
similarity index 100%
rename from settings/kmsettings.desktop
rename to settings/kcm_kmsettings.desktop
[prev in list] [next in list] [prev in thread] [next in thread]