OSDN Git Service

libs: remove kephal library dependency where not used
authorIvailo Monev <xakepa10@gmail.com>
Wed, 30 Jun 2021 09:35:52 +0000 (12:35 +0300)
committerIvailo Monev <xakepa10@gmail.com>
Wed, 30 Jun 2021 09:35:52 +0000 (12:35 +0300)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
libs/plasmaclock/CMakeLists.txt
libs/plasmagenericshell/CMakeLists.txt
libs/plasmagenericshell/tests/CMakeLists.txt
libs/taskmanager/CMakeLists.txt

index 7291457..c57f3b0 100644 (file)
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_SOURCE_DIR}/libs/kephal)
-
 set(plasmaclock_LIB_SRCS
     clockapplet.cpp
     calendar.cpp
@@ -13,16 +11,23 @@ set(plasmaclock_LIB_SRCS
 add_library(plasmaclock SHARED ${plasmaclock_LIB_SRCS})
 
 target_link_libraries(plasmaclock
-                      ${KDE4_PLASMA_LIBS}
-                      ${KDE4_KDEUI_LIBS}
-                      ${KDE4_KIO_LIBS}
-                      kephal)
-
+    ${KDE4_PLASMA_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KIO_LIBS}
+)
 
-set_target_properties(plasmaclock PROPERTIES VERSION ${GENERIC_LIB_VERSION}
-SOVERSION ${GENERIC_LIB_SOVERSION} )
+set_target_properties(plasmaclock PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
 
 #clockapplet.h
-install(FILES clockapplet.h calendar.h calendartable.h plasmaclock_export.h
-        DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasmaclock COMPONENT Devel)
-install(TARGETS plasmaclock EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+    FILES clockapplet.h calendar.h calendartable.h plasmaclock_export.h
+    DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}/plasmaclock
+    COMPONENT Devel
+)
+install(
+    TARGETS plasmaclock
+    EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
index 8c17e39..18e31d3 100644 (file)
@@ -50,7 +50,6 @@ target_link_libraries(plasmagenericshell PUBLIC
     ${QT_QTDECLARATIVE_LIBRARY}
     ${QT_QTUITOOLS_LIBRARY}
     kworkspace
-    kephal
 )
 
 if(Q_WS_X11)
index ceaf5c6..bd62a25 100644 (file)
@@ -1,4 +1,7 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../widgetsexplorer)
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../widgetsexplorer
+)
 
 add_definitions(-DPLASMAGENERICSHELL_EXPORT=)
 
@@ -10,7 +13,12 @@ set(appletexplorer_SRCS
    main.cpp
    )
 add_executable(plasmaappletexplorer ${appletexplorer_SRCS})
-target_link_libraries(plasmaappletexplorer ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${QT_QTDECLARATIVE_LIBRARY} kephal)
+target_link_libraries(plasmaappletexplorer
+    ${KDE4_PLASMA_LIBS}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KFILE_LIBS}
+    ${QT_QTDECLARATIVE_LIBRARY}
+)
 
 set(backgrounddialog_SRCS
     background.cpp
index 9e3d79c..5e6d7e1 100644 (file)
@@ -1,5 +1,4 @@
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1204)
-include_directories(${CMAKE_SOURCE_DIR}/libs/kephal)
 
 ########### next target ###############
 
@@ -35,7 +34,6 @@ target_link_libraries(taskmanager PUBLIC
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS}
     processcore
-    kephal
 )
 
 target_link_libraries(taskmanager PRIVATE
@@ -76,6 +74,6 @@ install(FILES
 #)
 
 #add_executable(tasksmodeltest ${tasksmodel_SRCS})
-#target_link_libraries(tasksmodeltest ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} taskmanager kephal)
+#target_link_libraries(tasksmodeltest ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} taskmanager)