diff options
author | Michele Calgaro <[email protected]> | 2019-07-07 22:21:21 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2019-07-07 22:40:46 +0900 |
commit | 7214a7b6b590d62aac622dbf2de31b1ca1ba78d5 (patch) | |
tree | e63d5e40e1a2d4d4a8efb0990ebff10dcf163617 /tdecore/tdehw/CMakeLists.txt | |
parent | c76553c4fb3ee8f839c17b4dc3c3beb3c4338eb3 (diff) | |
download | tdelibs-7214a7b6b590d62aac622dbf2de31b1ca1ba78d5.tar.gz tdelibs-7214a7b6b590d62aac622dbf2de31b1ca1ba78d5.zip |
tdehw: code restructuring for tdestoragedevice.
1. added disk helper source files
2. removed WITH_UDISKS2, WITH_UDISK, WITH_UDEVIL defines. The respective code is always included
3. order of execution for mount/umount activities: udisks2, udisk, udevil, pmount.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdecore/tdehw/CMakeLists.txt')
-rw-r--r-- | tdecore/tdehw/CMakeLists.txt | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/tdecore/tdehw/CMakeLists.txt b/tdecore/tdehw/CMakeLists.txt index 02b775931..9495b3717 100644 --- a/tdecore/tdehw/CMakeLists.txt +++ b/tdecore/tdehw/CMakeLists.txt @@ -17,13 +17,6 @@ if( NOT DBUS_SYSTEM_BUS ) set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE ) endif() -if( WITH_TDEHWLIB_DAEMONS OR WITH_HAL OR WITH_DEVKITPOWER OR WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR - WITH_NETWORK_MANAGER_BACKEND OR WITH_CONSOLEKIT ) - list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${DBUS_TQT_INCLUDE_DIRS} ) - list( APPEND TDEHW_CUSTOM_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} ) - list( APPEND TDEHW_CUSTOM_LIBRARIES ${DBUS_TQT_LIBRARIES} ) -endif( ) - if( WITH_TDEHWLIB_DAEMONS ) add_definitions( -DWITH_TDEHWLIB_DAEMONS ) endif( ) @@ -44,18 +37,6 @@ if( WITH_UPOWER ) add_definitions( -DWITH_UPOWER ) endif( ) -if( WITH_UDISKS ) - add_definitions( -DWITH_UDISKS ) -endif( ) - -if( WITH_UDISKS2 ) - add_definitions( -DWITH_UDISKS2 ) -endif( ) - -if( WITH_UDEVIL ) - add_definitions( -DWITH_UDEVIL ) -endif( ) - if( WITH_CONSOLEKIT ) add_definitions( -DWITH_CONSOLEKIT ) endif( ) @@ -92,14 +73,17 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_BINARY_DIR}/tdeio/kssl + ${DBUS_TQT_INCLUDE_DIRS} ${TDEHW_CUSTOM_INCLUDE_DIRS} ) link_directories( ${TQT_LIBRARY_DIRS} + ${DBUS_TQT_LIBRARY_DIRS} ${TDEHW_CUSTOM_LIBRARY_DIRS} ) + ##### headers ################################### install( FILES tdehardwaredevices.h tdenetworkconnections.h tdegenericdevice.h @@ -120,10 +104,11 @@ set( ${target}_SRCS tdemainspowerdevice.cpp tdenetworkdevice.cpp tdebacklightdevice.cpp tdemonitordevice.cpp tdesensordevice.cpp tderootsystemdevice.cpp tdeeventdevice.cpp tdeinputdevice.cpp tdecryptographiccarddevice.cpp + disksHelper.cpp ) tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} - LINK udev ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES} + LINK udev ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${TDEHW_CUSTOM_LIBRARIES} ) |