mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
kutils: use separate build file for kidletime library
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
9b64878a8d
commit
4a09dd4dad
4 changed files with 75 additions and 69 deletions
|
@ -15,70 +15,7 @@ add_subdirectory(kdnssd)
|
||||||
add_subdirectory(karchive)
|
add_subdirectory(karchive)
|
||||||
add_subdirectory(kemail)
|
add_subdirectory(kemail)
|
||||||
add_subdirectory(knetworkmanager)
|
add_subdirectory(knetworkmanager)
|
||||||
|
add_subdirectory(kidletime)
|
||||||
######## kidletime ####################
|
|
||||||
|
|
||||||
set(kidletime_LIB_SRCS
|
|
||||||
kidletime/kidletime.cpp
|
|
||||||
kidletime/abstractsystempoller.cpp
|
|
||||||
kidletime/widgetbasedpoller.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
if (HAVE_XSCREENSAVER)
|
|
||||||
set(kidletime_LIB_SRCS ${kidletime_LIB_SRCS}
|
|
||||||
kidletime/xscreensaverbasedpoller.cpp
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(HAVE_XSYNC)
|
|
||||||
set(kidletime_LIB_SRCS
|
|
||||||
${kidletime_LIB_SRCS}
|
|
||||||
kidletime/xsyncbasedpoller.cpp
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set_source_files_properties(
|
|
||||||
${CMAKE_SOURCE_DIR}/kutils/kidletime/xscreensaverbasedpoller.cpp
|
|
||||||
${CMAKE_SOURCE_DIR}/kutils/kidletime/xsyncbasedpoller.cpp
|
|
||||||
PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(kidletime SHARED ${kidletime_LIB_SRCS})
|
|
||||||
|
|
||||||
target_link_libraries(kidletime PUBLIC
|
|
||||||
${QT_QTGUI_LIBRARY}
|
|
||||||
kdecore
|
|
||||||
kdeui
|
|
||||||
)
|
|
||||||
|
|
||||||
if(HAVE_XSCREENSAVER)
|
|
||||||
target_link_libraries(kidletime PRIVATE ${X11_Xscreensaver_LIB})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(HAVE_XSYNC)
|
|
||||||
target_link_libraries(kidletime PRIVATE ${X11_Xext_LIB})
|
|
||||||
endif()
|
|
||||||
target_link_libraries(kidletime PRIVATE ${X11_X11_LIB})
|
|
||||||
|
|
||||||
set_target_properties(kidletime PROPERTIES
|
|
||||||
VERSION ${GENERIC_LIB_VERSION}
|
|
||||||
SOVERSION ${GENERIC_LIB_SOVERSION}
|
|
||||||
)
|
|
||||||
|
|
||||||
generate_export_header(kidletime)
|
|
||||||
|
|
||||||
install(
|
|
||||||
FILES
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/kidletime_export.h
|
|
||||||
kidletime/kidletime.h
|
|
||||||
DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
TARGETS kidletime
|
|
||||||
EXPORT kdelibsTargets
|
|
||||||
DESTINATION ${KDE4_LIB_INSTALL_DIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
########### kcmutils ###############
|
########### kcmutils ###############
|
||||||
|
|
||||||
|
|
68
kutils/kidletime/CMakeLists.txt
Normal file
68
kutils/kidletime/CMakeLists.txt
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
project(kidletime)
|
||||||
|
|
||||||
|
######## kidletime ####################
|
||||||
|
|
||||||
|
set(kidletime_LIB_SRCS
|
||||||
|
kidletime.cpp
|
||||||
|
abstractsystempoller.cpp
|
||||||
|
widgetbasedpoller.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
if (HAVE_XSCREENSAVER)
|
||||||
|
set(kidletime_LIB_SRCS
|
||||||
|
${kidletime_LIB_SRCS}
|
||||||
|
xscreensaverbasedpoller.cpp
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(HAVE_XSYNC)
|
||||||
|
set(kidletime_LIB_SRCS
|
||||||
|
${kidletime_LIB_SRCS}
|
||||||
|
xsyncbasedpoller.cpp
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set_source_files_properties(
|
||||||
|
${CMAKE_SOURCE_DIR}/kutils/kidletime/xscreensaverbasedpoller.cpp
|
||||||
|
${CMAKE_SOURCE_DIR}/kutils/kidletime/xsyncbasedpoller.cpp
|
||||||
|
PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE
|
||||||
|
)
|
||||||
|
|
||||||
|
add_library(kidletime SHARED ${kidletime_LIB_SRCS})
|
||||||
|
|
||||||
|
target_link_libraries(kidletime PUBLIC
|
||||||
|
${QT_QTGUI_LIBRARY}
|
||||||
|
kdecore
|
||||||
|
kdeui
|
||||||
|
)
|
||||||
|
target_link_libraries(kidletime PRIVATE
|
||||||
|
${X11_X11_LIB}
|
||||||
|
)
|
||||||
|
|
||||||
|
if(HAVE_XSCREENSAVER)
|
||||||
|
target_link_libraries(kidletime PRIVATE ${X11_Xscreensaver_LIB})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(HAVE_XSYNC)
|
||||||
|
target_link_libraries(kidletime PRIVATE ${X11_Xext_LIB})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set_target_properties(kidletime PROPERTIES
|
||||||
|
VERSION ${GENERIC_LIB_VERSION}
|
||||||
|
SOVERSION ${GENERIC_LIB_SOVERSION}
|
||||||
|
)
|
||||||
|
|
||||||
|
generate_export_header(kidletime)
|
||||||
|
|
||||||
|
install(
|
||||||
|
FILES
|
||||||
|
${CMAKE_CURRENT_BINARY_DIR}/kidletime_export.h
|
||||||
|
kidletime.h
|
||||||
|
DESTINATION ${KDE4_INCLUDE_INSTALL_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
install(
|
||||||
|
TARGETS kidletime
|
||||||
|
EXPORT kdelibsTargets
|
||||||
|
DESTINATION ${KDE4_LIB_INSTALL_DIR}
|
||||||
|
)
|
|
@ -22,6 +22,7 @@
|
||||||
#include <QtCore/QObject>
|
#include <QtCore/QObject>
|
||||||
#include <QtCore/QHash>
|
#include <QtCore/QHash>
|
||||||
#include <kidletime_export.h>
|
#include <kidletime_export.h>
|
||||||
|
|
||||||
class KIdleTimePrivate;
|
class KIdleTimePrivate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -47,11 +47,11 @@ XSyncBasedPoller *XSyncBasedPoller::instance()
|
||||||
}
|
}
|
||||||
|
|
||||||
XSyncBasedPoller::XSyncBasedPoller(QWidget *parent)
|
XSyncBasedPoller::XSyncBasedPoller(QWidget *parent)
|
||||||
: AbstractSystemPoller(parent)
|
: AbstractSystemPoller(parent)
|
||||||
, m_display(QX11Info::display())
|
, m_display(QX11Info::display())
|
||||||
, m_idleCounter(X::None)
|
, m_idleCounter(X::None)
|
||||||
, m_resetAlarm(X::None)
|
, m_resetAlarm(X::None)
|
||||||
, m_available(true)
|
, m_available(true)
|
||||||
{
|
{
|
||||||
Q_ASSERT(!s_globalXSyncBasedPoller->q);
|
Q_ASSERT(!s_globalXSyncBasedPoller->q);
|
||||||
s_globalXSyncBasedPoller->q = this;
|
s_globalXSyncBasedPoller->q = this;
|
||||||
|
|
Loading…
Add table
Reference in a new issue